undo some changes done by the automatic merging