fix: merge conflict

...r/ModelFromNVE/__pycache__/setenvironment.cpython-311.pyc

server/ModelFromNVE/config/_api.json

server/ModelFromNVE/config/_folders.json

server/ModelFromNVE/config/api.json

server/ModelFromNVE/config/folders.json

server/ModelFromNVE/functions.py

...romNVE/icemodelling/__pycache__/constants.cpython-311.pyc

...ModelFromNVE/icemodelling/__pycache__/ice.cpython-311.pyc

...NVE/icemodelling/__pycache__/icethickness.cpython-311.pyc

...icemodelling/__pycache__/parameterization.cpython-311.pyc

...E/icemodelling/__pycache__/weatherelement.cpython-311.pyc

server/ModelFromNVE/icemodelling/constants.py

server/ModelFromNVE/icemodelling/ice.py

server/ModelFromNVE/icemodelling/icethickness.py

server/ModelFromNVE/icemodelling/parameterization.py

server/ModelFromNVE/icemodelling/weatherelement.py

...icemodellingscripts/__pycache__/plotlakes.cpython-311.pyc

.../ModelFromNVE/icemodellingscripts/getIceThicknessLakes.py

server/ModelFromNVE/icemodellingscripts/plotlakes.py

...ing og the Nighttime Surface Energy Balance over Land.pdf