Create conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	first_commit_file2.txt
Resolve conflict