add a new branch
jajajja
conlict fixed
add merge
merge with no-ff