Created conflict on test.txt
No conflict on test.txt
Merge branch 'conflict'

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/ferdiependon/practice