Edit conflict.txt! Edited from Windows.
Merge remote-tracking branch 'github_git_practice/master'

Conflicts:
	conflict.txt