From 54b510cf3458a0384426508392afe2b5331aaf14 Mon Sep 17 00:00:00 2001
From: testing2 <tester@109.86.70.81>
Date: Tue, 18 Apr 2023 10:52:39 +0300
Subject: [PATCH] new conflict

---
 file-main | 2 +-
 file2     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 file2

diff --git a/file-main b/file-main
index 6041a3f..897c348 100644
--- a/file-main
+++ b/file-main
@@ -11,7 +11,7 @@ main file code
 4
 3
 2
-1
+ooooo1
 er
 wt
 sg
diff --git a/file2 b/file2
new file mode 100644
index 0000000..fa81868
--- /dev/null
+++ b/file2
@@ -0,0 +1,4 @@
+r
+r
+r
+r