Bumped version to v0.12.0
Handling merge conflicts in package.json