Merge the latest code