diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 90b534876f..02eaa775d8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,6 +6,24 @@ Here are some guidelines, and ways you can help.
 > (This document is a bit of a work-in-progress, so please bear with us.
 > If you don't see what you're looking for here, please don't hesitate to reach out!)
 
+## Merging
+
+If your username is kouhai, or you're otherwise merging from upstream glitch-soc
+for some reason, the following snippets may be useful:
+
+```sh
+git fetch glitch && git merge glitch/main && git checkout glitch/main -- yarn.lock
+```
+
+```sh
+export RAILS_ENV=production NODE_ENV=production
+export OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder
+bundle install \
+&& yarn install \
+&& bundle exec rake assets:clobber \
+&& bundle exec rake webpacker:compile | tee /tmp/out.log
+```
+
 ## Translations
 
 You can submit glitch-soc-specific translations via [Crowdin](https://crowdin.com/project/glitch-soc). They are periodically merged into the codebase.
diff --git a/Procfile.dev b/Procfile.dev
index fbb2c2de23..18867de12b 100644
--- a/Procfile.dev
+++ b/Procfile.dev
@@ -1,4 +1,5 @@
 web: env PORT=3000 RAILS_ENV=development bundle exec puma -C config/puma.rb
 sidekiq: env PORT=3000 RAILS_ENV=development bundle exec sidekiq
 stream: env PORT=4000 yarn run start
-webpack: bin/webpack-dev-server
+webpack: env RAILS_ENV=development NODE_ENV=development NODE_OPTIONS=--openssl-legacy-provider ./bin/webpack-dev-server --listen-host 0.0.0.0
+caddy: caddy run