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