diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 03e29508fe..a48b384170 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -57,9 +57,17 @@ jobs:
           - "3.11"
     steps:
     - uses: actions/checkout@v3
+    # @melasmar
+    # TODO: Revert back to use 3.7 to all operating systems after the regression issue in Python
+    # https://github.com/actions/setup-python/issues/682 in github action got resolved
     - uses: actions/setup-python@v4
+      if: matrix.os != 'macos-latest' || ( matrix.os == 'macos-latest' && matrix.python != '3.7' )
       with:
         python-version: ${{ matrix.python }}
+    - uses: actions/setup-python@v4
+      if: matrix.os == 'macos-latest' && matrix.python == '3.7'
+      with:
+        python-version: "3.7.16"
     - run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md"  # prevent Bug_report.md from being renamed or deleted
     - run: make init
     - run: make pr
diff --git a/.github/workflows/validate_pyinstaller.yml b/.github/workflows/validate_pyinstaller.yml
index b611420310..697e163a16 100644
--- a/.github/workflows/validate_pyinstaller.yml
+++ b/.github/workflows/validate_pyinstaller.yml
@@ -50,7 +50,11 @@ jobs:
         with:
           python-version: "3.7"
       - name: Set up Go
+<<<<<<< HEAD
         uses: actions/setup-go@v4
+=======
+        uses: actions/setup-go@v3
+>>>>>>> 44daa48b (chore: Rebase config project to develop (#5406))
         with:
           go-version: "1.20"
       - name: Build PyInstaller
diff --git a/appveyor-windows.yml b/appveyor-windows.yml
index 28567c956f..2d11524025 100644
--- a/appveyor-windows.yml
+++ b/appveyor-windows.yml
@@ -150,6 +150,13 @@ install:
 
 
 
+  # claim some disk space before starting the tests
+  - "docker system prune -a -f"
+  # activate virtual environment
+  - "venv\\Scripts\\activate"
+
+
+
 # Final clean up no matter success or failure
 on_finish:
   # Upload test reports as artifacts
diff --git a/samcli/__init__.py b/samcli/__init__.py
index 1fea4bd55f..d19c41cc78 100644
--- a/samcli/__init__.py
+++ b/samcli/__init__.py
@@ -2,4 +2,8 @@
 SAM CLI version
 """
 
+<<<<<<< HEAD
 __version__ = "1.90.0"
+=======
+__version__ = "1.88.0"
+>>>>>>> 44daa48b (chore: Rebase config project to develop (#5406))
diff --git a/samcli/commands/delete/delete_context.py b/samcli/commands/delete/delete_context.py
index 3928c0cddb..1424c87f4a 100644
--- a/samcli/commands/delete/delete_context.py
+++ b/samcli/commands/delete/delete_context.py
@@ -9,7 +9,7 @@
 from botocore.exceptions import NoCredentialsError, NoRegionError
 from click import confirm, prompt
 
-from samcli.cli.cli_config_file import TomlProvider
+from samcli.cli.cli_config_file import ConfigProvider
 from samcli.commands.delete.exceptions import CfDeleteFailedStatusError
 from samcli.commands.exceptions import AWSServiceClientError, RegionError
 from samcli.lib.bootstrap.companion_stack.companion_stack_builder import CompanionStack
diff --git a/samcli/commands/remote/invoke/cli.py b/samcli/commands/remote/invoke/cli.py
index 3f3a771ea1..0318566b4a 100644
--- a/samcli/commands/remote/invoke/cli.py
+++ b/samcli/commands/remote/invoke/cli.py
@@ -4,7 +4,7 @@
 
 import click
 
-from samcli.cli.cli_config_file import TomlProvider, configuration_option
+from samcli.cli.cli_config_file import ConfigProvider, configuration_option
 from samcli.cli.context import Context
 from samcli.cli.main import aws_creds_options, common_options, pass_context, print_cmdline_args
 from samcli.cli.types import RemoteInvokeOutputFormatType
@@ -42,7 +42,7 @@
     requires_credentials=True,
     context_settings={"max_content_width": 120},
 )
-@configuration_option(provider=TomlProvider(section="parameters"))
+@configuration_option(provider=ConfigProvider(section="parameters"))
 @click.option("--stack-name", required=False, help="Name of the stack to get the resource information from")
 @click.argument("resource-id", required=False)
 @click.option(
diff --git a/samcli/lib/config/file_manager.py b/samcli/lib/config/file_manager.py
index ab1e000ff3..43f2609e4d 100644
--- a/samcli/lib/config/file_manager.py
+++ b/samcli/lib/config/file_manager.py
@@ -131,7 +131,7 @@ def write(document: dict, filepath: Path):
         toml_document = TomlFileManager._to_toml(document)
 
         if toml_document.get(COMMENT_KEY, None):  # Remove dunder comments that may be residue from other formats
-            toml_document.add(tomlkit.comment(toml_document[COMMENT_KEY]))
+            toml_document.add(tomlkit.comment(toml_document.get(COMMENT_KEY, "")))
             toml_document.pop(COMMENT_KEY)
 
         filepath.write_text(tomlkit.dumps(toml_document))