- Repair merge conflict.