Fix changelog

Author: andystaples

CHANGELOG.md

@@ -5,19 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-<<<<<<< andystaples/add-inprocess-test-backend
-## 1.4.0
+## Unreleased
 
 ADDED
 
 - Added `durabletask.testing` module with `InMemoryOrchestrationBackend` for testing orchestrations without a sidecar process
-=======
-## Unreleased
 
 FIXED:
 
 - Fix unbound variable in entity V1 processing
->>>>>>> main
 
 ## v1.3.0