From 4f4cc7a9efb564801bcf5ee18cdac29adfef880b Mon Sep 17 00:00:00 2001
From: Jonathan Mieloo <jonathan@posthog.com>
Date: Thu, 8 Jan 2026 18:35:48 +0100
Subject: [PATCH] asdfasdf

---
 test.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test.txt b/test.txt
index 999bcbe..b348989 100644
--- a/test.txt
+++ b/test.txt
@@ -4,3 +4,5 @@ new line
 test change
 wowie
 hi
+test
+conflicting change