From 2e01ad9cd25601b96e7fcfc2145f8d6251a7768e Mon Sep 17 00:00:00 2001
From: James Booker <98477043+james-booker1@users.noreply.github.com>
Date: Fri, 3 Jun 2022 14:24:58 -0700
Subject: [PATCH 1/4] adds city

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index bab3bfab4..40f39bf3b 100644
--- a/cities.html
+++ b/cities.html
@@ -26,6 +26,7 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
+    <li>Vancouver(14,666,999)</li>
   </ol>
 
 </body>

From 421b60110d5c280452da93efdd31ec4c98b5f3d1 Mon Sep 17 00:00:00 2001
From: JorLo <jory.laurin@gmail.com>
Date: Fri, 3 Jun 2022 14:25:58 -0700
Subject: [PATCH 2/4] adds Venice to html

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index bab3bfab4..43b3d3646 100644
--- a/cities.html
+++ b/cities.html
@@ -22,6 +22,7 @@ <h1>Top cities, by population</h1>
   <hr/>
 
   <ol>
+    <li>Venice (18,659,273)</li>
     <li>Shanghai (17,836,133)</li>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>

From d9b6b631f85d2e3ee971265602e6e2d0d83084a8 Mon Sep 17 00:00:00 2001
From: Markjust1 <novikov711@gmail.com>
Date: Fri, 3 Jun 2022 15:26:46 -0600
Subject: [PATCH 3/4] add a city

---
 cities.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cities.html b/cities.html
index bab3bfab4..5d067076d 100644
--- a/cities.html
+++ b/cities.html
@@ -22,6 +22,7 @@ <h1>Top cities, by population</h1>
   <hr/>
 
   <ol>
+    <li>Sin City (12,566,456)</li>
     <li>Shanghai (17,836,133)</li>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>

From ba6fb92083a7f7bb7fb0779774b02c4e46720a2b Mon Sep 17 00:00:00 2001
From: James Booker <98477043+james-booker1@users.noreply.github.com>
Date: Fri, 3 Jun 2022 14:55:56 -0700
Subject: [PATCH 4/4] push baby push

---
 cities.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/cities.html b/cities.html
index eba860cd0..ce9157596 100644
--- a/cities.html
+++ b/cities.html
@@ -22,11 +22,8 @@ <h1>Top cities, by population</h1>
   <hr/>
 
   <ol>
-<<<<<<< HEAD
     <li>Venice (18,659,273)</li>
-=======
     <li>Sin City (12,566,456)</li>
->>>>>>> 984e8d5811ac23202723f91075f54940e5d9c106
     <li>Shanghai (17,836,133)</li>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>