killed node_modules and bumped version for backwards-incompatible changes
resolved merge