AND simple
& simple
conflict fixed
merge no ff
add .gitignore