Clean Resolver

Write resolveConflictFile(text, chosen) where chosen is "mine" or "theirs": return the file with the conflict block replaced by the chosen side's lines — markers removed, surrounding context preserved exactly.

Difficulty: intermediate