[aerogear-issues] [JBoss JIRA] (AEROGEAR-1376) Conflict management