create branch
Creating a new branch is quick AND simple.
Creating a new branch is quick & simple.
conflict fixed
Creating other change on featrue1
Creating other change on featrue1
merge with no-ff