some
Merge origin/master

Conflicts:
	SomeDir/newjson.json