Github user ajs6f commented on the issue:
https://github.com/apache/jena/pull/339
It's no big deal-- happens all the time! Do you know how to rebase and
resolve conflicts in Git?
https://help.github.com/articles/resolving-merge-conflicts-after-a-git-rebase/
https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/---
