[aerogear-issues] [JBoss JIRA] (AGJS-215) DiffMatchPatch conflict resolver