git commit -a -m something
update gitignore
remove node modules
resolve conflict in index
verify assemble and build working