From 6aa765c73f1946bda52202a3672d7454cbe7fbed Mon Sep 17 00:00:00 2001
From: Daniel Xu <xu2082@data.cs.purdue.edu>
Date: Tue, 3 Mar 2026 11:11:16 -0500
Subject: [PATCH 1/4] whatever

---
 contact.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contact.html b/contact.html
index 4a47427..0b0990b 100644
--- a/contact.html
+++ b/contact.html
@@ -13,7 +13,6 @@
   </head>
   <body>
     <nav>
-      <div class="logo">USB x INNOVATEHER</div>
       <div class="nav-items">
         <a href="index.html">Home</a> <a href="learn.html">Learn</a> <a href="contact.html">Contact</a>
       </div>
@@ -36,3 +35,6 @@
     </section>
   </body>
 </html>
+
+this is whatever the TA told me to do lmao, adding a line here to see if git push is actually working
+

From c2b490fc91f5f6617fea67a0899e8c652f172fc6 Mon Sep 17 00:00:00 2001
From: DeLobster <xudaniel1025@gmail.com>
Date: Tue, 3 Mar 2026 11:13:41 -0500
Subject: [PATCH 2/4] this is a thing

---
 contact.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contact.html b/contact.html
index 0b0990b..5fb17e2 100644
--- a/contact.html
+++ b/contact.html
@@ -36,5 +36,5 @@
   </body>
 </html>
 
-this is whatever the TA told me to do lmao, adding a line here to see if git push is actually working
+this is whatever the TA told me to do, adding a line here to see if git push is actually working
 

From 794a97c524c774c0964e5cd5ecf7259e5eac4b65 Mon Sep 17 00:00:00 2001
From: DeLobster <xudaniel1025@gmail.com>
Date: Tue, 3 Mar 2026 11:13:47 -0500
Subject: [PATCH 3/4] this is a thing

---
 .idea/.gitignore      | 8 ++++++++
 .idea/gitworkshop.iml | 9 +++++++++
 .idea/misc.xml        | 6 ++++++
 .idea/modules.xml     | 8 ++++++++
 .idea/vcs.xml         | 6 ++++++
 5 files changed, 37 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/gitworkshop.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/gitworkshop.iml b/.idea/gitworkshop.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/gitworkshop.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..a47cb2d
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="temurin-25" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..00955e3
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/gitworkshop.iml" filepath="$PROJECT_DIR$/.idea/gitworkshop.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

From 7073de5937e81934935c2a8027648914ec79eb04 Mon Sep 17 00:00:00 2001
From: DeLobster <xudaniel1025@gmail.com>
Date: Tue, 3 Mar 2026 11:20:33 -0500
Subject: [PATCH 4/4] merge conflict

---
 contact.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contact.html b/contact.html
index 5fb17e2..fa04d6f 100644
--- a/contact.html
+++ b/contact.html
@@ -36,5 +36,7 @@
   </body>
 </html>
 
+this message is coming from another branch from Daniel, this is to create a merge conflict
+
 this is whatever the TA told me to do, adding a line here to see if git push is actually working
 
