# M03-L04 exercise — Resolve a conflict and undo a fault

**Start:** M03-L03; separate clones of the supplied generic history bundle.

In three distinct history-bundle clones:

1. Resolve the prepared left/right README conflict into one accurate synthetic-origin sentence, remove markers, stage, review, and commit.
2. Create an unwanted unstaged README edit from a clean CP01 baseline, inspect it, and discard only that edit with working-tree restore.
3. Create a branch from FAULT-hysteresis, inspect the isolated HEAD fault, reproduce its test failure, revert HEAD, rerun native tests and cross-build.

Submit a starting-state/preservation/action/result record for each folder. Keep useful work accounted for and describe actual results without claiming physical validation.