adding sails
fixing conflict