added ship
fixed merge errors