fix:merge conflict

.coverage

README.md

app/lib/data_classes.dart

app/lib/utils/export_data.dart

app/lib/widgets/bar_data.dart

app/lib/widgets/choropleth_map.dart

app/lib/widgets/info_layer.dart

app/lib/widgets/main_layout.dart

app/lib/widgets/stat_charts.dart

app/linux/flutter/generated_plugin_registrant.cc

app/linux/flutter/generated_plugins.cmake

app/macos/Flutter/GeneratedPluginRegistrant.swift

app/pubspec.lock

app/pubspec.yaml

app/windows/flutter/generated_plugin_registrant.cc

app/windows/flutter/generated_plugins.cmake

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

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

...p_handler/__pycache__/update_measurements.cpython-311.pyc

server/map_handler/lake_relations/all_lake_names.json