From 2263f2223adac9dc884b4c467932d3fe8e36ef06 Mon Sep 17 00:00:00 2001
From: Cristian Vijelie <cristianvijelie@gmail.com>
Date: Mon, 20 Mar 2023 11:53:16 +0200
Subject: [PATCH] Add second branch modification

---
 file.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/file.txt b/file.txt
index f8f28a2..1c7b183 100644
--- a/file.txt
+++ b/file.txt
@@ -1,3 +1,5 @@
 This is a very important feature of this project!
 
-This feature will not be changed in the near future!
+<<<<<<< HEAD
+This feature was approved by the big boss.
+>>>>>>>