branch test
add readme.txt
:sdfsdf

dfsdfsdffds^o

O
\

Creating a new branch is quick AND simple.Creating a new branch is quick AND simple.O
remvosdfsdf
Merge branch 'feature1'

X

x
AND simple
& simple
confict fixed
readme.txt
add merge
merge with no-ff