merge conflict resolution (i have to do this each time i solve a merge
conflict?  okay.)