message: Update CHANGELOG.md
  Removed git leftovers
diff: @@ -22,9 +22,6 @@ All notable changes to this project will be documented in this file. The format
  * `deploy_hash` field is now defaulted to a random value rather than zeros in `DeployItemBuilder`.
  -
  -<<<<<<< HEAD
  -=======
  ## 2.1.0
  ### Added
  @@ -32,7 +29,6 @@ All notable changes to this project will be documented in this file. The format
  ->>>>>>> upstream/dev
  ## 2.0.3 - 2021-12-06
  ### Added
  