chore(deps-dev): bump @types/node from 20.11.0 to 20.11.2 (#1912)

.devcontainer/Dockerfile

@@ -1,30 +1,14 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.212.0/containers/javascript-node/.devcontainer/base.Dockerfile
-<<<<<<< HEAD
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node@sha256:ff7fcaf39a616aed41b7e9af6ebedfee1c605e89ba9416c6fa79f33762345aa7
-=======
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT="20-bullseye"
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
->>>>>>> 5d382569 (feat(maintenance): add support for nodejs20.x runtime (#1790))
 
 # Install fnm to manage Node.js versions
 RUN curl -fsSL https://fnm.vercel.app/install -o /tmp/install \
   && chmod a+x /tmp/install \
   && /tmp/install \
   && rm /tmp/install
 
-<<<<<<< HEAD
 # Install AWS SAM CLI
 RUN curl -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
   && unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation \
   && sudo ./sam-installation/install \
   && rm -rf sam-installation aws-sam-cli-linux-*
-=======
-# Install fnm to manage Node.js versions
-RUN curl -fsSL https://fnm.vercel.app/install | bash -s
-
-RUN wget https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip \
-    && unzip aws-sam-cli-linux-x86_64.zip -d sam-installation \
-    && sudo ./sam-installation/install \
-    && rm -rf sam-installation aws-sam-cli-linux-*
->>>>>>> 5d382569 (feat(maintenance): add support for nodejs20.x runtime (#1790))

docs/maintainers.md

@@ -160,11 +160,7 @@ Some examples using our initial and new RFC templates: [#447](https://github.com
 
 ### Releasing a new version
 
-<<<<<<< HEAD
 Firstly, make sure all the PRs that you want to include in the release are merged into the `main` branch.
-=======
-Firstly, make sure all the PRs that you want to include in the release are merged into the `main` banch.
->>>>>>> d20269dd (docs(maintenance): add processes tab (#1747))
 
 Next, run the integration tests one last time to make sure everything is working as expected. See [Run end to end tests](#run-end-to-end-tests) for more details.