Cleaning up merge conflits