revert pull then merge