diff --git a/CHANGELOG.md b/CHANGELOG.md
index a19a4fa86c..0f209468d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 <<<<<<< HEAD
 =======
@@ -92,6 +93,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 =======
 >>>>>>> 0239ab6d (Bump Version to v0.3.8+dev (#1241))
 =======
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
+=======
 >>>>>>> 40a10ce1 (Bump v0.3.4+ dev)
 =======
 =======
@@ -115,14 +118,24 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 =======
 =======
 =======
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+=======
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
 >>>>>>> eva-master
 =======
 >>>>>>> 567ab492 (Bump Version to v0.3.8+dev (#1241))
+<<<<<<< HEAD
 >>>>>>> dbfef8c7 (Bump Version to v0.3.8+dev (#1241))
+<<<<<<< HEAD
 >>>>>>> 0239ab6d (Bump Version to v0.3.8+dev (#1241))
+=======
+=======
+=======
+>>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
 ##  [0.3.7] - 2023-09-30
 
 * PR #1239: release 0.3.7 
@@ -296,6 +309,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
@@ -341,11 +359,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 >>>>>>> fb7418af ([RELEASE]: v0.3.3 (#984))
 =======
 >>>>>>> ae08f806 (Bump v0.3.4+ dev)
 =======
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
+=======
 =======
 >>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 >>>>>>> d562016d ([RELEASE]: v0.3.3 (#984))
@@ -354,18 +375,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 =======
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 =======
+<<<<<<< HEAD
 =======
 >>>>>>> 2170a7a9 (Bump v0.3.4+ dev)
 =======
 >>>>>>> ff795625 ([RELEASE]: v0.3.3 (#984))
 =======
 >>>>>>> 22e78346 (Bump v0.3.4+ dev)
+=======
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
 >>>>>>> eva-master
 =======
 =======
 >>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 >>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
 =======
 =======
@@ -402,6 +427,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 =======
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 >>>>>>> ae08f806 (Bump v0.3.4+ dev)
+=======
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+>>>>>>> 71dab656 ([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 2b8a773fd4..ef396fe25e 100644
--- a/evadb/version.py
+++ b/evadb/version.py
@@ -22,6 +22,7 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 _REVISION = "9"
 =======
 _REVISION = "8+dev"
@@ -69,6 +70,8 @@
 >>>>>>> 0239ab6d (Bump Version to v0.3.8+dev (#1241))
 =======
 >>>>>>> 8565e9b7 (v0.3.8 - new release (#1303))
+=======
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
 _REVISION = "8"
 >>>>>>> 7cac771f (Bump v0.3.4+ dev)
 =======
@@ -81,6 +84,9 @@
 _REVISION = "8+dev"
 >>>>>>> bcb19939 (v0.3.8 - new release (#1303))
 =======
+_REVISION = "8+dev"
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+=======
 _REVISION = "7"
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
 =======
@@ -149,16 +155,20 @@
 >>>>>>> bcb19939 (v0.3.8 - new release (#1303))
 =======
 =======
+<<<<<<< HEAD
 =======
 >>>>>>> 7dd70375 (release: merge staging into master (#1032))
 =======
 >>>>>>> a9124e1e (release: merge staging into master (#1032))
+=======
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
 _REVISION = "8"
 =======
 _REVISION = "3"
 >>>>>>> 9c0af83d ([RELEASE]: v0.3.3 (#984))
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 >>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
 <<<<<<< HEAD
 >>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
@@ -254,6 +264,10 @@
 >>>>>>> c3b45b61 (v0.3.8 - new release (#1303))
 >>>>>>> bcb19939 (v0.3.8 - new release (#1303))
 >>>>>>> 8565e9b7 (v0.3.8 - new release (#1303))
+=======
+>>>>>>> a4989c0a ([RELEASE]: v0.3.3 (#984))
+>>>>>>> 00cf1584 ([RELEASE]: v0.3.3 (#984))
+>>>>>>> 71dab656 ([RELEASE]: v0.3.3 (#984))
 
 VERSION_SHORT = f"{_MAJOR}.{_MINOR}"
 VERSION = f"{_MAJOR}.{_MINOR}.{_REVISION}"