reverts another merging failure