just undo some merged changes