repair last commit; changes in merge file, not original master