test branch
force commit
uppercase
conflict fixed
head upper
tail upper
conflict fixed
some feature
conflict
merge h
merge with no-ff