Added Merge and Conflict Resolution

Added help for Merge and Conflict Resolution