undo some changes of pull merge