sails app init
conflict resolved