Cleaning up merge conflicts