Merge the new changes to my branch