fix: merge conflicts with main

...ngscripts/__pycache__/getIceThicknessLakes.cpython-39.pyc

server/ModelFromNVE/logs/icemodelling_2024-05-19.log

server/ModelFromNVE/logs/icemodelling_2024-05-20.log

...elFromNVE/utilities/__pycache__/makepickle.cpython-39.pyc

server/Sentinelhub/__pycache__/box_funcitons.cpython-39.pyc

server/Sentinelhub/__pycache__/getAreaInfo.cpython-39.pyc

server/Sentinelhub/unit_test/test_box_functions.py

server/Sentinelhub/unit_test/test_getAreaInfo.py

server/data_processing/area_processing.py

server/data_processing/input_new_data.py

server/data_processing/process_lidar_data.py

...est_add_new_lidar_measurement.cpython-39-pytest-7.1.2.pyc

...pycache__/test_input_new_data.cpython-39-pytest-7.1.2.pyc