push conflicting change
Merge branch 'master' of https://github.com/dlee0113/git_test

Conflicts:
	test.txt