merge revert