revert and merge