hotfix branch
feature branch
feature child commit
feature child commit 2
commint in test branch
Merge branch 'feature_child' into test
merge of hotfix in test