diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e053c5708..d09eeea906 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### [Deprecated]
 ### [Removed]
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -48,6 +49,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * PR #1182: Bump Version to v0.3.7+dev 
 * PR #1181: releass: bump a version further to skip cached wheel 
 
+=======
+>>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
 ##  [0.3.6] - 2023-09-21
 
 * PR #1181: releass: bump a version further to skip cached wheel 
@@ -129,11 +132,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * PR #986: docs: Update README.md 
 * PR #983: doc: fix nav bar 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 =======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
+=======
+=======
+>>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
+>>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
 ##  [0.3.3] - 2023-08-29
 
 * PR #983: doc: fix nav bar 
diff --git a/evadb/version.py b/evadb/version.py
index 1c36737c37..dfaac7e631 100644
--- a/evadb/version.py
+++ b/evadb/version.py
@@ -3,6 +3,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 _REVISION = "8"
 =======
 _REVISION = "3"
@@ -13,6 +14,12 @@
 =======
 _REVISION = "8+dev"
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
+=======
+_REVISION = "7"
+=======
+_REVISION = "3"
+>>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
+>>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
 
 VERSION_SHORT = f"{_MAJOR}.{_MINOR}"
 VERSION = f"{_MAJOR}.{_MINOR}.{_REVISION}"