Cleaning up merge conflict