test merging from 2 sources
Merge remote-tracking branch 'upstream/master'

Conflicts:
	desc.txt
test shared commits