# Conflicts:
#	CHANGELOG.md

This reverts commit c6e79c7.

This reverts commit cdfc915.

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md

… the domesticHotWaterStorage tick

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala

…nning in the last state

# Conflicts:
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala

…rage

# Conflicts:
#	CHANGELOG.md

# Conflicts:
#	CHANGELOG.md
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala

# Conflicts:
#	CHANGELOG.md
#	src/main/scala/edu/ie3/simona/agent/participant/ParticipantAgentFundamentals.scala
#	src/main/scala/edu/ie3/simona/event/ResultEvent.scala
#	src/main/scala/edu/ie3/simona/model/participant/HpModel.scala
#	src/main/scala/edu/ie3/simona/model/thermal/ThermalGrid.scala
#	src/test/scala/edu/ie3/simona/agent/em/EmAgentIT.scala
#	src/test/scala/edu/ie3/simona/agent/grid/ThermalGridIT.scala
#	src/test/scala/edu/ie3/simona/model/participant/HpModelSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridTestData.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseAndStorageSpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithHouseOnlySpec.scala
#	src/test/scala/edu/ie3/simona/model/thermal/ThermalGridWithStorageOnlySpec.scala

… min level