Commiting deletions
Commited out merge conflict in index.js