abc
abcd
abcde
Merge branch 'foo'

Conflicts:
	branch.txt
Lab_7