testing merge full
Merge remote-tracking branch 'origin/master'

Conflicts:
	some-dir/something.txt
	something2.txt