Init sails project
Fix init conflicts