fixed a conflict that git didn't remember to tell us