Merge the latest changes