Conflict help guide

Added guide for new merge conflict functionality