dddddd
eeeee
fffff
f2
Merge branch 'feature/fuc3' into develop
Merge branch 'feature/func4' into develop

Conflicts:
	mytest.txt
tesfs
xxxxxxx
Merge branch 'feature/func4' into develop
yyyyy
bbbb
vvv
Merge branch 'feature/fuc5' into develop

Conflicts:
	mytest2.txt
Merge branch 'release/sdfs'