diff --git a/docs/source/reference/databases/github.rst b/docs/source/reference/databases/github.rst
index 244aee918..5bcbbd512 100644
--- a/docs/source/reference/databases/github.rst
+++ b/docs/source/reference/databases/github.rst
@@ -42,6 +42,7 @@ Create Connection
 Supported Tables
 ----------------
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 * ``stargazers``: Lists the people that have starred the repository. Check `table_column_info.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/table_column_info.py>`_ for all the available columns in the table.
@@ -51,6 +52,9 @@ Supported Tables
 =======
 * ``stargazers``: Lists the people that have starred the repository. Check `evadb/third_party/databases/github/table_column_info.py` for all the available columns in the table.
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
+=======
+* ``stargazers``: Lists the people that have starred the repository. Check `table_column_info.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/table_column_info.py>`_ for all the available columns in the table.
+>>>>>>> 858b8c1c (Collection of fixes for the staging branch (#1253))
 
 .. code-block:: sql
 
@@ -70,6 +74,7 @@ Here is the query output:
 
 .. note::
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
    Looking for another table from Github? You can add a table mapping in `github_handler.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/github_handler.py>`_, or simply raise a `Feature Request <https://github.com/georgia-tech-db/evadb/issues/new/choose>`_.
@@ -79,3 +84,6 @@ Here is the query output:
 =======
    Looking for another table from Github? You can add a table mapping in `evadb/third_party/databases/github/github_handler.py`, or simply raise a `Feature Request <https://github.com/georgia-tech-db/evadb/issues/new/choose>`_.
 >>>>>>> 6d6a14c8 (Bump v0.3.4+ dev)
+=======
+   Looking for another table from Github? You can add a table mapping in `github_handler.py <https://github.com/georgia-tech-db/evadb/blob/staging/evadb/third_party/databases/github/github_handler.py>`_, or simply raise a `Feature Request <https://github.com/georgia-tech-db/evadb/issues/new/choose>`_.
+>>>>>>> 858b8c1c (Collection of fixes for the staging branch (#1253))
diff --git a/evadb.db b/evadb.db
deleted file mode 100644
index e69de29bb..000000000
diff --git a/test/integration_tests/long/test_github_datasource.py b/test/integration_tests/long/test_github_datasource.py
index 1d00728b2..fcfd515f5 100644
--- a/test/integration_tests/long/test_github_datasource.py
+++ b/test/integration_tests/long/test_github_datasource.py
@@ -31,9 +31,12 @@ def setUp(self):
     def tearDown(self):
         execute_query_fetch_all(self.evadb, "DROP DATABASE IF EXISTS github_data;")
 
+<<<<<<< HEAD
     @pytest.mark.skip(
         reason="Need https://github.com/georgia-tech-db/evadb/pull/1280 for a cost-based rebatch optimization"
     )
+=======
+>>>>>>> 858b8c1c (Collection of fixes for the staging branch (#1253))
     @pytest.mark.xfail(reason="Flaky testcase due to `bad request` error message")
     def test_should_run_select_query_in_github(self):
         # Create database.
diff --git a/test/third_party_tests/test_github_datasource.py b/test/third_party_tests/test_github_datasource.py
deleted file mode 100644
index 0c02dff19..000000000
--- a/test/third_party_tests/test_github_datasource.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# coding=utf-8
-# Copyright 2018-2023 EvaDB
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-import unittest
-from test.util import get_evadb_for_testing
-
-import pytest
-
-from evadb.server.command_handler import execute_query_fetch_all
-from evadb.third_party.databases.github.table_column_info import STARGAZERS_COLUMNS
-
-
-@pytest.mark.notparallel
-class GithubDataSourceTest(unittest.TestCase):
-    def setUp(self):
-        self.evadb = get_evadb_for_testing()
-        # reset the catalog manager before running each test
-        self.evadb.catalog().reset()
-
-    def tearDown(self):
-        execute_query_fetch_all(self.evadb, "DROP DATABASE IF EXISTS github_data;")
-
-    @pytest.mark.xfail(reason="Flaky testcase due to `bad request` error message")
-    def test_should_run_select_query_in_github(self):
-        # Create database.
-        params = {
-            "owner": "georgia-tech-db",
-            "repo": "evadb",
-        }
-        query = f"""CREATE DATABASE github_data
-                    WITH ENGINE = "github",
-                    PARAMETERS = {params};"""
-        execute_query_fetch_all(self.evadb, query)
-
-        query = "SELECT * FROM github_data.stargazers LIMIT 10;"
-        batch = execute_query_fetch_all(self.evadb, query)
-        self.assertEqual(len(batch), 10)
-        expected_column = list(
-            ["stargazers.{}".format(col) for col, _ in STARGAZERS_COLUMNS]
-        )
-        self.assertEqual(batch.columns, expected_column)
-
-
-if __name__ == "__main__":
-    unittest.main()