revert direction of merge