Merge the code with the latest updates