diff --git a/changelog.d/236.md b/changelog.d/236.md
new file mode 100644
index 0000000..098c379
--- /dev/null
+++ b/changelog.d/236.md
@@ -0,0 +1,3 @@
+### Fixed
+
+- Forgejo drafts and fast-forward conflict-check windows no longer surface as merge conflicts when the API has not distinguished one (#236).