merge
Adding newfile
Adding newfile2
Adding new file 3
Adding new file 4
Merge branch 'sub_dev2' into sub_sub_dev2
Merge branch 'sub_sub_dev1' into sub_sub_dev2
Merge branch 'sub_dev1' into sub_sub_dev2
commit
hhh
Merge branch 'sub_sub_dev2' into dev

Conflicts:
	newfile2