[aerogear-issues] [JBoss JIRA] (AGDROID-284) Conflict resolution handling