trying to clean up a merge conflict