initial commit
update .gitignore
fix conflicts