test commit
test commit2
I love sushi
test commit3
feature1 commit
gf-feature2 commit
my third branch
i love sushi
conflict test
conflict test