From 5231ee23f319a36cd107aaef6cb170174ec88e3e Mon Sep 17 00:00:00 2001
From: skalyan3 <skalyan3@ncsu.edu>
Date: Tue, 19 Aug 2025 23:47:40 -0400
Subject: [PATCH] Conflict while merginf ro sure

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index c356016d6..05b4fe28b 100644
--- a/README.md
+++ b/README.md
@@ -67,3 +67,4 @@ We use [Weblate](https://hosted.weblate.org/projects/frigate-nvr/) to support la
 <img src="https://hosted.weblate.org/widget/frigate-nvr/multi-auto.svg" alt="Translation status" />
 </a>
 
+Conflict while merging for sure!
\ No newline at end of file