Github user xristy commented on the issue:
https://github.com/apache/jena/pull/339
Good grief!. Yes the conflicts are with PR
[#335](https://github.com/apache/jena/pull/335). I apparently merged too fast
when I saw the approval for 335 and proceeded with the development of the
highlight.
When I issued this PR no conflicts were showing so I thought all was ok. I
had prepared a squashed branch per prior requests.
What is the procedure to remedy?---
