[AS7-462] add a comment about conflict resolution
[AS7-462] add a comment about conflict resolution

was: eb28a364d5050566402f2480d06b59c0cb84f263

soul2zimate/wildfly-core,darranl/wildfly-core,jfdenise/wildfly-core,yersan/wildfly-core,luck3y/wildfly-core,darranl/wildfly-core,JiriOndrusek/wildfly-core,darranl/wildfly-core,bstansberry/wildfly-core,yersan/wildfly-core,aloubyansky/wildfly-core,jamezp/wildfly-core,aloubyansky/wildfly-core,JiriOndrusek/wildfly-core,bstansberry/wildfly-core,luck3y/wildfly-core,soul2zimate/wildfly-core,jfdenise/wildfly-core,yersan/wildfly-core,ivassile/wildfly-core,aloubyansky/wildfly-core,soul2zimate/wildfly-core,jamezp/wildfly-core,bstansberry/wildfly-core,luck3y/wildfly-core,JiriOndrusek/wildfly-core,ivassile/wildfly-core,jfdenise/wildfly-core,jamezp/wildfly-core,ivassile/wildfly-core