merge conflict, undo changes