fat manual merge from player with boat