undo stupid merge stuff