initial
fix conflict
update .gitignore