added ship and board agian
Merge