Deleted bundle.js
Added bundle.js to gitignore
Resolved merge conflicts.