Revert to version before merge