From 8850c93a3cb1d3b651d9565c4363bbc22bb4853e Mon Sep 17 00:00:00 2001
From: cheth117 <111476191+cheth117@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:03:08 +0530
Subject: [PATCH 1/2] Update project.txt

---
 project.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.txt b/project.txt
index 5c6de5e..bffd0a5 100644
--- a/project.txt
+++ b/project.txt
@@ -5,4 +5,4 @@ amazon ec2 instance
 hey this is monday 
 the first working day
 this time is precious
-
+hey

From 9806857abb1c2c5d21fd091fb85a573f4dc5fcc7 Mon Sep 17 00:00:00 2001
From: cheth117 <111476191+cheth117@users.noreply.github.com>
Date: Mon, 12 Sep 2022 14:42:55 +0530
Subject: [PATCH 2/2] Update project.txt

---
 project.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project.txt b/project.txt
index bffd0a5..6cf0e4c 100644
--- a/project.txt
+++ b/project.txt
@@ -6,3 +6,4 @@ hey this is monday
 the first working day
 this time is precious
 hey
+merge conflict