tset5 test6 commit
Merge branch 'conflict_branch'

Conflicts:
	test5.txt
Merge branch 'master' of github.com:truelightn/git_test