Testing Merge 2
Testing merging 3

Conflicts:
	README.md

resolved a conflict with the readme file