Sails init
merge