Undo merge.  I messed up the resolution of conflicts.