Revert of merge