Test Conflict and merge tool
modified at sprint-1
Merge branch 'sprint-1'

Conflicts:
	Check Name.txt