adding some content in README for Merge Conflicts.
Merge branch 'feature-1', after resolving merge conflicts.

Conflicts:
	README.md