message: triggering a merge conflict
diff: @@ -80,11 +80,6 @@ clippy-std:
  - for crate in ${ALL_CRATES}; do
  cargo clippy --verbose --all-features --manifest-path ${crate}/Cargo.toml -- -D warnings;
  done
  -<<<<<<< HEAD
  -
  -#### stage: examples
  -
  -=======
  #### stage: examples
  @@ -93,7 +88,6 @@ clippy-std:
  - cargo install --git https://github.com/paritytech/cargo-contract || echo $?
  - cargo contract -V
  ->>>>>>> conflicting changes
  examples-fmt:
  stage: examples
  <<: *docker-env
  