add message about expected conflicts
add message about expected conflicts

Per jrosler's suggestion adding some details about the conflict messages.
binduwavell/generator-alfresco,binduwavell/generator-alfresco,binduwavell/generator-alfresco,binduwavell/generator-alfresco,vprince1/generator-alfresco,vprince1/generator-alfresco,vprince1/generator-alfresco,vprince1/generator-alfresco