fix highlighting of characters in conflict
fix highlighting of characters in conflict

gryffon/ringteki,jeremylarner/ringteki,jeremylarner/ringteki,jeremylarner/ringteki,gryffon/ringteki,gryffon/ringteki