update gitignore
remove node modules
resolve conflict in index