Fixed merge conflict fixes

I dunno what happened there - git seemed to be really agressively not
recognizing similarities