first commit
add git ignore
fix conflict