stash
beggining of sailing
beginning of sailing
fixed merge conflicts