adding some content in README for Merge Conflicts.