[aerogear-issues] [JBoss JIRA] (AGJS-214) Conflict resolution handling