branch test
and simple
& simple
conflict fixed
add merga
merge with no-ff
add gitskills fils
add gitskills
delete line
merged bug
china txt
new change txt