# Conflicts: # src/network/network.cpp # src/pathfinder/yapf/yapf.h # src/pathfinder/yapf/yapf_ship.cpp # src/saveload/afterload.cpp # src/ship_cmd.cpp # src/station_cmd.cpp # src/vehicle.cpp # src/vehicle_gui.cpp