From fa5ead813a1ecc2d3b5816342c3f54393ed3e8ec Mon Sep 17 00:00:00 2001
From: annahuang28 <156022139+annahuang28@users.noreply.github.com>
Date: Thu, 6 Nov 2025 16:25:38 -0800
Subject: [PATCH 1/2] Update issue templates

---
 .github/ISSUE_TEMPLATE/another-tech-lead.md | 24 +++++++++++++++++++++
 .github/ISSUE_TEMPLATE/new-issue.md         | 21 ------------------
 2 files changed, 24 insertions(+), 21 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/another-tech-lead.md
 delete mode 100644 .github/ISSUE_TEMPLATE/new-issue.md

diff --git a/.github/ISSUE_TEMPLATE/another-tech-lead.md b/.github/ISSUE_TEMPLATE/another-tech-lead.md
new file mode 100644
index 0000000..99767bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/another-tech-lead.md
@@ -0,0 +1,24 @@
+---
+name: Another Tech Lead
+about: Create a new issue
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Description
+Create a merge conflict for me!
+
+Acceptance Criteria
+
+
+Follow steps in Part 2 (clone my repo, create your branch)
+
+In the home page, contribute some code.
+
+Push your branch to develop. Hopefully this forces a merge conflict!
+Note: You may have to clone an earlier version of this repository to force the merge conflict. See if you can do it! You may need to contact me :)
+
+Additional Information
+Include a screenshot of your page
diff --git a/.github/ISSUE_TEMPLATE/new-issue.md b/.github/ISSUE_TEMPLATE/new-issue.md
deleted file mode 100644
index 6dc29db..0000000
--- a/.github/ISSUE_TEMPLATE/new-issue.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: New Issue
-about: Create a new issue
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Description**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Acceptance Criteria**
-A clear and concise description of what you want to happen.
-
-Steps:
-- step 1
-- step 2
-
-**Additional Information**
-Add any other context or screenshots about the feature request here.

From f1a57c9d321c0ff7658cda453fac1fbe9a852842 Mon Sep 17 00:00:00 2001
From: Kailuan Liu <kailuan1127@gmail.com>
Date: Thu, 6 Nov 2025 16:55:54 -0800
Subject: [PATCH 2/2] kai-test

---
 src/app/page.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 2d87964..67061dd 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -6,22 +6,21 @@ export default function Home() {
       <div className={styles.container}>
         <img src="https://media.licdn.com/dms/image/v2/D5603AQFcya7jebNo2g/profile-displayphoto-shrink_200_200/profile-displayphoto-shrink_200_200/0/1724012519952?e=2147483647&v=beta&t=eTR6xwLbsXt6cUCogxfQUG1pujj0Gub6ns2h_sl4aXI" alt="Ryan Agdassi" className={styles.profilePic} />
 
-        <h1 className={styles.name}>Ryan Agdassi</h1>
-        <h2 className={styles.title}>Tech Advisor at Hack4Impact-Cal Poly</h2>
+        <h1 className={styles.name}>Kailuan Liu</h1>
+        <h2 className={styles.title}>Tech Lead at Hack4Impact-Cal Poly</h2>
 
         <section className={styles.section}>
           <h3 className={styles.sectionTitle}>About Me</h3>
           <p className={styles.about}>
-            Ryan Agdassi is a computer science student at California Polytechnic State University - San Luis Obispo. 
+            Kai is a computer science student at California Polytechnic State University - San Luis Obispo. 
           </p>
         </section>
 
         <section className={styles.section}>
           <h3 className={styles.sectionTitle}>Experience</h3>
           <ul className={styles.list}>
-            <li>Tech Advisor - Hack4Impact</li>
-            <li>Tech Lead - Hack4Impact, Go See Foundation</li>
-            <li>Software Developer - Hack4Impact, Partners in Equestrian Therapy</li>
+            <li>Tech Lead - Hack4Impact, MuchHope</li>
+            <li>Software Developer - Hack4Impact, Habitat For Humanity</li>
           </ul>
         </section>
 
@@ -31,7 +30,7 @@ export default function Home() {
             <li>JavaScript, TypeScript</li>
             <li>React, Next.js, Node.js</li>
             <li>Python, Java, C</li>
-            <li>MongoDB, PostgreSQL</li>
+            <li>MongoDB</li>
           </ul>
         </section>
       </div>