Cleaning up merge conflict stuff