just committed a checkout branch
Merge remote-tracking branch 'origin/checkoutx'

Conflicts:
	test.txt