revert of merge