testing a conflicting commit
Merge branch 'master' of github.com:elemeht/test_git

Conflicts:
	fileone.txt