Merge the newest changes