[aerogear-issues] [JBoss JIRA] (AGIOS-267) DiffMatchPatch conflict resolver