create branch
and simple
& simple
confilict fixed
add learning git
merge with no-ff