branch test
int i ++
printf i
Merge branch 'feature1'
print fuck i
print end i
confilct fixed
append i++
merge with no-ff  dev_pirnt i++