chore: fix the changelog
@@ -40,10 +40,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Improvements
- Local mode, execution in Docker: re-use the Docker images so that the execution is faster
-<<<<<<< HEAD
-=======
-
->>>>>>> fix the changelog
## [0.11.0] - 2021-10-04
### Added
