[aerogear-issues] [JBoss JIRA] (AEROGEAR-8741) No context about the conflict when resolving it on the client