From ff2f15e25d575f30ccc3f96d93fab24aac32c662 Mon Sep 17 00:00:00 2001
From: Seun Oshitade <seun.oshitade@gmail.com>
Date: Mon, 25 Apr 2022 16:11:03 +0000
Subject: [PATCH 1/4] Add city of Calgary

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

diff --git a/cities.html b/cities.html
index bab3bfab4..9f0026beb 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>Calgary   (12,478,447)</li>
   </ol>
 
 </body>

From 02afb0b5c44133bf371ae851929f62c9184b2d2d Mon Sep 17 00:00:00 2001
From: Harshbir Singh <singh.hveer1@gmail.com>
Date: Mon, 25 Apr 2022 10:39:24 -0600
Subject: [PATCH 2/4] Add city

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

diff --git a/cities.html b/cities.html
index bab3bfab4..8d19afd6a 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>Edson  (8000)</li>
   </ol>
 
 </body>

From 5e8b00bdf8385574e9e27da329758b41bffab8e6 Mon Sep 17 00:00:00 2001
From: Edgarsar <edgarsargsyan@hotmail.com>
Date: Mon, 25 Apr 2022 18:28:11 +0000
Subject: [PATCH 3/4] merge to master

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

diff --git a/cities.html b/cities.html
index 538748ee1..2a887b0f5 100644
--- a/cities.html
+++ b/cities.html
@@ -26,12 +26,10 @@ <h1>Top cities, by population</h1>
     <li>Istanbul (13,854,740)</li>
     <li>Karachi  (12,991,000)</li>
     <li>Mumbai   (12,478,447)</li>
-<<<<<<< HEAD
     <li>Edson  (8000)</li>
-=======
     <li>Calgary   (12,478,447)</li>
->>>>>>> ff2f15e25d575f30ccc3f96d93fab24aac32c662
   </ol>
 
+  
 </body>
 </html>

From 40528fb7404a2787bdc30273acf640e6a1fca0f9 Mon Sep 17 00:00:00 2001
From: Edgarsar <edgarsargsyan@hotmail.com>
Date: Mon, 25 Apr 2022 18:37:09 +0000
Subject: [PATCH 4/4] add saskatoon

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

diff --git a/cities.html b/cities.html
index 2a887b0f5..b828786d6 100644
--- a/cities.html
+++ b/cities.html
@@ -28,6 +28,8 @@ <h1>Top cities, by population</h1>
     <li>Mumbai   (12,478,447)</li>
     <li>Edson  (8000)</li>
     <li>Calgary   (12,478,447)</li>
+    <li>Saskatoon   (12,478,447)</li>
+
   </ol>