revert merge conflict