Require real merge commit and keep level tests embedded

LevelsCompare.md

@@ -124,7 +124,7 @@ This file records the upstream Ruby setup and validation intent beside the Andro
 | `find_old_branch` | Current branch is `solve_world_hunger`. | Same. | Equivalent. |
 | `revert` | More than three commits and a revert of "Bad commit" exists. | A commit message starts with `Revert`. | Slightly looser; sufficient for current fixture. |
 | `restore` | `file3` exists. | `file3` is tracked. | Equivalent. |
-| `conflict` | On `master`, merge commit has two parents, conflict markers removed, both poem lines preserved. | Requires a merge action on `master`, conflict markers removed, and the correct `Sat on a wall` poem line preserved. | Known gap: Android does not expose merge-parent count in `RepoState`, so it tracks the merge command instead. |
+| `conflict` | On `master`, merge commit has two parents, conflict markers removed, both poem lines preserved. | Requires the latest commit on `master` to be a two-parent merge commit, conflict markers removed, and the correct `Sat on a wall` poem line preserved. | Equivalent. |
 | `submodule` | `githug-include-me` directory exists, has README, and is a gitlink/submodule. | `submodules` contains `githug-include-me` URL. | Equivalent state projection. |
 | `contribute` | Clones upstream and checks for a commit authored by configured user. | Any nonblank command. | Deliberate mobile/offline simplification for the final contribution prompt. |
 
@@ -159,6 +159,5 @@ These are the remaining known non-parity items that need additional model suppor
 
 - `stage_lines`: model partial staged vs unstaged hunks.
 - `merge_squash`: verify the exact squashed file/content effects.
-- `conflict`: expose merge parent count in `RepoState` instead of relying on tracked merge-command evidence.
 - `rebase_onto`: verify final commit count/content and removal of "Wrong changes".
 - `contribute`, `clone`, `clone_to_folder`: current Android behavior intentionally avoids real network-dependent validation.