# Conflicts:
#	VECTO/GUI/MainForm.vb
#	VECTO/Input Files/Engine.vb
#	VECTO/Input Files/Gearbox.vb
#	VECTO/Input Files/MockVehicleInputData.vb
#	VectoCommon/VectoCommon/Resources/XMLNames.resx
#	VectoCore/VectoCore/InputData/FileIO/JSON/JSONSubComponent.cs
#	VectoCore/VectoCore/InputData/FileIO/XML/Declaration/DataProvider/XMLDeclarationVehicleDataProvider.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/JobContainer.cs
#	VectoCore/VectoCore/Models/Simulation/Impl/SimulatorFactory/SimulatorFactory.cs
#	VectoCore/VectoCore/OutputData/SummaryDataContainer.cs
#	VectoCore/VectoCore/Utils/VectoVersionCore.cs
#	VectoCore/VectoCore/Utils/XMLDefinitions.cs
#	VectoCore/VectoCore/Utils/XMLHelper.cs
#	VectoCore/VectoCore/VectoCore.csproj
#	VectoCore/VectoCoreTest/FileIO/JsonReadHybridTest.cs
#	VectoCore/VectoCoreTest/Integration/ADAS/ADASTests.cs
#	VectoCore/VectoCoreTest/Integration/CompletedBus/CompletedBusFactorMethodTest.cs
#	VectoCore/VectoCoreTest/Integration/Declaration/ExemptedVehicleTest.cs
#	VectoCore/VectoCoreTest/TestData/XML/XMLReaderDeclaration/SchemaVersion2.1/vecto_vehicle-components_1.0.xml
#	VectoCore/VectoCoreTest/Utils/MockDeclarationVehicleInputData.cs
#	VectoCore/VectoCoreTest/VectoCoreTest.csproj
#	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/CompletedHeavyBus_33b1.RSLT_VIF.xml
#	VectoCore/VectoCoreTest/bin/Debug/TestData/Integration/Buses/FactorMethod/primary_heavyBus group42_SmartPS.RSLT_VIF.xml
#	VectoCore/VectoXML.spp