branch test
add .ds_store and gitskills
AND simple
& simple
conflict fixed
add merge
merge with no-ff