Files for exercises
Make some conflicts
Another conflicts...
My small commit
Clean up
Merge branch 'bgx-test-branch'

Conflicts:
	file_1.txt