test conflict

must be conflict
Merge remote-tracking branch 'origin/master'asd

Conflicts:
	testnewfile.txtsda