Option 1: have the person fix it on their side.
Option 2 (for the crazy like me): use REGEX!!!
On an editor supporting REGEX find/replace:
- Look for (match): <<<<<<< .*[\n]([\s\S]*?)=======[\n]([\s\S]*?)>>>>>>> .*[\n]
- To keep the first, replace by: $1
- To keep the second, replace by: $2
