branch git
upade feature1
& simple
conflict fixed
this is dev
merge with no-ff