From 6f7896368212e35d0b78633bd154f633abfef966 Mon Sep 17 00:00:00 2001
From: Bublik Karolina <bublikkm@student.bmstu.ru>
Date: Tue, 2 Jun 2026 16:05:17 +0300
Subject: [PATCH] newfile in master

---
 newfile | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 newfile

diff --git a/newfile b/newfile
new file mode 100644
index 0000000..1a457da
--- /dev/null
+++ b/newfile
@@ -0,0 +1,2 @@
+newfile for conflict
+