package.json tweaks
fix conflicts