diff --git a/CHANGELOG.md b/CHANGELOG.md
index e26a1ac..923350d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -256,11 +256,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.2.0] - 2021-03-15
 
 ### Added
-<<<<<<< HEAD
-- Prophet model wrapper from `pomopt` project.
-=======
 - Prophet model wrapper.
->>>>>>> dc7dd923fc491fc9d3a609a80126add805ab1d2f
 - `add_future_dates` utils to add prediction dates onto time_series DataFrames.
 - New tests for `Forecaster` module.