Sails init
Resolve conflicts