test branch
test release branch
Merge branch 'release' into develop
add fun1 test
Merge branch 'feature-fun1' into develop
add test fun2
merge fun2
Merge branch 'develop'