Odd merge conflict failure

[mtbc]

ome/openmicroscopy#5170 suffers from,

[ scc.git] INFO Conflict detection failed

Given the PR name this may be another Unicode issue akin to #188.

[mtbc]

Yes, removing the Unicode seems to have fixed the problem. There was some in both the title and the description.