From 64fca7cc14ccccc1b2b4cae3f3925e41080d3361 Mon Sep 17 00:00:00 2001
From: Jerry Huang <jh4248@drexel.edu>
Date: Tue, 3 Dec 2024 19:18:20 -0500
Subject: [PATCH] Change README on master

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

diff --git a/README.md b/README.md
index c00c4d6..bef5aa6 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
 # Git Laboratory
 This is a feature branch. 
+This will also cause a conflict.
-- 
GitLab