fix bug 1234
add feature2 in feature2 branch
update feature2
add fix
fix merge issue
update
resolve merge conflict
Merge branch 'feature3' - update
update
feature3 rebasing practice