diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77a79e1..bd34f67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,22 @@
 
 ### Features
 
+<<<<<<< HEAD
 - Create sulej.ch
   ([40c353f](https://github.com/Arlind-dev/sulej.ch/commit/40c353ff4efe2ed26f4462ecef7dd08a23437474))
+||||||| parent of d0122b6 (docs(changelog): rebased entire repo)
+* Create sulej.ch ([9814ab8](https://github.com/Arlind-dev/sulej.ch/commit/9814ab83122785f7baefba7da27c9871b926e7e6))
+=======
+* **init:** create sulej.ch ([40c353f](https://github.com/Arlind-dev/sulej.ch/commit/40c353ff4efe2ed26f4462ecef7dd08a23437474))
+>>>>>>> d0122b6 (docs(changelog): rebased entire repo)
 
 ### Miscellaneous Chores
 
+<<<<<<< HEAD
 - **ci:** add signed commits
   ([61fc8af](https://github.com/Arlind-dev/sulej.ch/commit/61fc8af54da54653a5faedcded6ea3830c17e50d))
+||||||| parent of d0122b6 (docs(changelog): rebased entire repo)
+* **ci:** add signed commits ([c926beb](https://github.com/Arlind-dev/sulej.ch/commit/c926beb5c8a4a75acac59528b696a84b45398fcd))
+=======
+* **ci:** add signed commits ([80a110d](https://github.com/Arlind-dev/sulej.ch/commit/80a110d15b700f4b4e94c8e8865e9d07d62a3ce4))
+>>>>>>> d0122b6 (docs(changelog): rebased entire repo)