Partiial remerge after rollback