# Conflicts: # client/RailEnterprise.Client/assets/i18n/strings.csv # client/RailEnterprise.Client/scripts/Main.cs # client/RailEnterprise.Client/scripts/Screens/MenuScreen.cs # docs/ARCHITECTURE.md # docs/PROTOCOL.md # docs/STATE.md # src/RailEnterprise.Protocol/Client/ClientWorld.cs