add a files
and simple
& simple
conflick fixed
add merge
merge with no-ff