Merge pull request #55 from dupuy/avoid-markup-merge-conflict-fp Don't report markup titles as merge conflicts