initial commit
add gitignore
fix conflict