test3
conflict1

Conflicts:
	test.txt
Merge branch 'master' of https://github.com/hard-fault/Build3rs

Conflicts:
	test.txt