do something2
do something3
Merge branch 'feature/myfeature' into develop
fix conflict
init function2
modify function2
Merge branch 'feature/add_function2' into develop
add function3
function1 dosomething