[aerogear-issues] [JBoss JIRA] (AGDROID-285) DiffMatchPatch conflict resolver