From bf1479b3e314e1911b0f8bcd85069b5bd98fb84e Mon Sep 17 00:00:00 2001
From: Nico Korthout <nicokorthout@gmail.com>
Date: Fri, 10 May 2024 17:17:24 +0200
Subject: [PATCH]  "BACKPORT-CONFLICT"

---
 conflict | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/conflict b/conflict
index 9b1719f..e4f3582 100644
--- a/conflict
+++ b/conflict
@@ -1 +1,5 @@
+<<<<<<< HEAD
 conflict
+=======
+This will conflict
+>>>>>>> 3457521 (Add a change that will conflict)