The merge is an obvious fail, revert