diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e7a9ae3362..ede4e3ca36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -12,7 +12,7 @@ variables:
   # Note: this is deprecated!
   # ttps://docs.gitlab.com/ee/ci/yaml/#shallow-cloning
   GIT_DEPTH: 3
-  GIT_CLEAN_FLAGS: -f
+  GIT_CLEAN_FLAGS: -n
 
 default:
   image: registry.gitlab.com/veloren/veloren-docker-ci/cache:e134e812
@@ -33,8 +33,8 @@ before_script:
   - export DISABLE_GIT_LFS_CHECK=true
   - export VELOREN_ASSETS="$(pwd)/assets"
   - echo "VELOREN_ASSETS=$VELOREN_ASSETS"
-  - export RUSTFLAGS="-D warnings"
-  - rm -rf target || echo "it seems that sometimes OLD data is left over"
+    #- export RUSTFLAGS="-D warnings"
+    #- rm -rf target || echo "it seems that sometimes OLD data is left over"
 
 # 8866215 is the user that is used to sync data to the collaboration repos
 workflow:
diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml
index cc6fcbd679..c2e2dffeef 100644
--- a/.gitlab/CI/build.gitlab-ci.yml
+++ b/.gitlab/CI/build.gitlab-ci.yml
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 unittests:
   extends: .recompile-branch
   stage: build
@@ -49,6 +50,59 @@ coverage:
     - cargo tarpaulin -v -- --test-threads=2
   retry:
     max: 2
+=======
+# unittests:
+#   extends: .recompile-branch
+#   stage: build
+#   variables:
+#     GIT_DEPTH: 9999999999999
+#   script:
+#     - ln -s /dockercache/cache-all target
+#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - cargo test --package veloren-voxygen --lib test_all_localizations -- --nocapture --ignored
+#     - rm -r target/debug/incremental* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - cargo test
+#   retry:
+#     max: 2
+# 
+# benchmarks:
+#   extends: .post-merge
+#   stage: build
+#   tags:
+#     - veloren-benchmark
+#   script:
+#     - unset DISABLE_GIT_LFS_CHECK
+#     - ln -s /dockercache/cache-all target
+#     - ls -la target/*
+#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - cargo bench || exit 0 #temp fix
+#     - TAGUUID="Z$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 16 | head -n 1)" || echo "ignore this returncode, dont ask me why, it works"
+#     - echo $TAGUUID
+#     - echo 'SET veloren.timestamp = "'"$(git show --no-patch --no-notes --pretty='%cd' HEAD)"'";' > upload.sql
+#     - echo "SET veloren.branch = \$${TAGUUID}\$${CI_COMMIT_REF_NAME}\$${TAGUUID}\$;" >> upload.sql
+#     - echo "SET veloren.sha = \$${TAGUUID}\$${CI_COMMIT_SHA}\$${TAGUUID}\$;" >> upload.sql
+#     - find target/criterion -wholename "*new/*.csv" -exec echo '\copy benchmarks ("group", "function", "value", throughput_num, throughput_type, sample_measured_value, unit, iteration_count) from '"'{}' csv header" >> upload.sql \;
+#     - cat upload.sql
+#     - PGPASSWORD="${CIDBPASSWORD}" PGSSLROOTCERT="./.gitlab/ci-db.crt" psql "sslmode=verify-ca host=auth.veloren.net dbname=benchmarks" -U bsdrftsejrhdrjhgd -f upload.sql;
+#   retry:
+#     max: 2
+# 
+# # Coverage is needed on master for the README.md badge to work
+# # tmp remove simd as it doesnt work with tarpaulin: https://github.com/rust-lang/rust/issues/77529
+# coverage:
+#   extends: .post-merge
+#   stage: build
+#   script:
+#     - ln -s /dockercache/cache-tarpaulin target
+#     - rm -r target/debug/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
+#     - find ./* -name "Cargo.toml" -exec sed -i 's/, "simd"]/]/g' {} \;
+#     - find ./* -name "Cargo.toml" -exec sed -i 's/"simd"]/]/g' {} \;
+#     - sed -i 's/vek /#vek /g' ./Cargo.toml;
+#     - cargo tarpaulin -v -- --test-threads=2
+#   retry:
+#     max: 2
+>>>>>>> ee4cacf6c (Disable CI that does not need to run for builds)
 
 #linux, windows, macos builds here as template
 .tlinux:
diff --git a/.gitlab/CI/check.gitlab-ci.yml b/.gitlab/CI/check.gitlab-ci.yml
index 171f72dbc5..200bdd1d5e 100644
--- a/.gitlab/CI/check.gitlab-ci.yml
+++ b/.gitlab/CI/check.gitlab-ci.yml
@@ -8,10 +8,10 @@ code-quality:
     - cargo clippy --all-targets --locked -- -D warnings
     - cargo fmt --all -- --check
 
-security:
-  extends: .recompile-branch
-  stage: check
-  allow_failure: true
-  script:
-    - ln -s /dockercache/cache-all target
-    - cargo audit
+#security:
+#extends: .recompile-branch
+#stage: check
+#allow_failure: true
+#script:
+#- ln -s /dockercache/cache-all target
+#- cargo audit
diff --git a/voxygen/src/hud/settings_window/video.rs b/voxygen/src/hud/settings_window/video.rs
index 6203fe611e..064300ae5e 100644
--- a/voxygen/src/hud/settings_window/video.rs
+++ b/voxygen/src/hud/settings_window/video.rs
@@ -987,7 +987,9 @@ impl<'a> Widget for Video<'a> {
             .lossy_terrain_compression
             != lossy_terrain_compression
         {
-            events.push(ToggleLossyTerrainCompression(lossy_terrain_compression));
+            events.push(GraphicsChange::ToggleLossyTerrainCompression(
+                lossy_terrain_compression,
+            ));
         }
 
         // Resolution