Fixed HUGE bug.
updated package.json with correct version.
resolved merge conflicts.
composer.json file bumped
1.0.2