add playerShip to player
merge