Testing more
Bottom line
Topmost line
Merge branch 'bugfix' into feature-test

Conflicts:
	test.txt
Finished merge.