reverting with a merge