merge conflict

src/ship/ship.rs

@@ -414,7 +414,7 @@ impl<EG: EntityGateway> ShipServerState<EG> {
                 handler::message::player_unequips_item(id, &player_unequip_item, &mut self.entity_gateway, &mut self.clients, &mut self.item_manager).await?
             },
             GameMessage::SortItems(sort_items) => {
-                handler::message::player_sorts_items(id, sort_items, &mut self.entity_gateway, &mut self.clients, &mut self.item_manager).await
+                handler::message::player_sorts_items(id, sort_items, &mut self.entity_gateway, &mut self.clients, &mut self.item_manager).await?
             },
             _ => {
                 let cmsg = msg.clone();