# Conflicts:
#	build.gradle

# Conflicts:
#	.scalafmt.conf
#	build.gradle
#	src/main/scala/edu/ie3/simona/agent/grid/DBFSAlgorithm.scala
#	src/main/scala/edu/ie3/simona/agent/grid/GridResultsSupport.scala
#	src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgent.scala
#	src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/ServiceRegistration.scala
#	src/main/scala/edu/ie3/simona/agent/participant/evcs/EvcsAgent.scala
#	src/main/scala/edu/ie3/simona/agent/participant/evcs/EvcsAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/fixedfeedin/FixedFeedInAgent.scala
#	src/main/scala/edu/ie3/simona/agent/participant/fixedfeedin/FixedFeedInAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgent.scala
#	src/main/scala/edu/ie3/simona/agent/participant/hp/HpAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/load/LoadAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/pv/PvAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/agent/participant/statedata/BaseStateData.scala
#	src/main/scala/edu/ie3/simona/agent/participant/statedata/ParticipantStateData.scala
#	src/main/scala/edu/ie3/simona/agent/participant/wec/WecAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/api/ExtSimAdapter.scala
#	src/main/scala/edu/ie3/simona/config/ConfigFailFast.scala
#	src/main/scala/edu/ie3/simona/main/RunSimonaStandalone.scala
#	src/main/scala/edu/ie3/simona/model/participant/ChpModel.scala
#	src/main/scala/edu/ie3/simona/model/participant/load/LoadModel.scala
#	src/main/scala/edu/ie3/simona/model/participant/load/profile/ProfileLoadModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/CylindricalThermalStorage.scala
#	src/main/scala/edu/ie3/simona/scheduler/Scheduler.scala
#	src/main/scala/edu/ie3/simona/scheduler/SchedulerData.scala
#	src/main/scala/edu/ie3/simona/service/ev/ExtEvDataService.scala
#	src/main/scala/edu/ie3/simona/service/primary/PrimaryServiceProxy.scala
#	src/main/scala/edu/ie3/simona/service/weather/WeatherSource.scala
#	src/main/scala/edu/ie3/simona/sim/SimonaSim.scala
#	src/main/scala/edu/ie3/simona/sim/setup/SetupHelper.scala
#	src/main/scala/edu/ie3/simona/sim/setup/SimonaStandaloneSetup.scala
#	src/main/scala/edu/ie3/simona/util/ConfigUtil.scala
#	src/main/scala/edu/ie3/util/scala/quantities/ReactivePower.scala
#	src/test/scala/edu/ie3/simona/agent/grid/DBFSAlgorithmParticipantSpec.scala
#	src/test/scala/edu/ie3/simona/agent/grid/GridAgentSetup2WSpec.scala
#	src/test/scala/edu/ie3/simona/agent/grid/GridAgentSetup3WSpec.scala
#	src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentalsSpec.scala
#	src/test/scala/edu/ie3/simona/agent/participant/ParticipantAgentMock.scala
#	src/test/scala/edu/ie3/simona/agent/participant/PvAgentModelCalculationSpec.scala
#	src/test/scala/edu/ie3/simona/api/ExtSimAdapterSpec.scala
#	src/test/scala/edu/ie3/simona/event/listener/RuntimeEventListenerSpec.scala
#	src/test/scala/edu/ie3/simona/model/participant/ApparentPowerAndHeatSpec.scala
#	src/test/scala/edu/ie3/simona/scheduler/ScheduleLockIT.scala
#	src/test/scala/edu/ie3/simona/scheduler/ScheduleLockSpec.scala
#	src/test/scala/edu/ie3/simona/scheduler/SchedulerSpec.scala
#	src/test/scala/edu/ie3/simona/scheduler/TimeAdvancerSpec.scala
#	src/test/scala/edu/ie3/simona/service/primary/PrimaryServiceProxySqlIT.scala
#	src/test/scala/edu/ie3/simona/service/weather/WeatherServiceSpec.scala
#	src/test/scala/edu/ie3/simona/test/common/input/PvInputTestData.scala
#	src/test/scala/edu/ie3/simona/test/matchers/QuantityMatchers.scala
#	src/test/scala/edu/ie3/simona/util/ConfigUtilSpec.scala