cherry-pick
+bootstrap
Cherry-pick
Remove sails from package.json
Merge conflict in package.json