merge conflict
update .gitignore