Merge failure - rollback