Merge with the latest code