[aerogear-issues] [JBoss JIRA] (AEROGEAR-9310) ConflictLink. Implement an automerge strategy that merges data when no conflict