fix weird merge markup
Merge pull request #4104 from dimagi/opm-cz

fix weird merge markup