Adding a ship board
fixed merge conflict