[aerogear-issues] [JBoss JIRA] (AEROGEAR-1412) Define how conflicts are managed