From 1a8128d422ff4cb5554a5bd9b0bf841ea05f8601 Mon Sep 17 00:00:00 2001
From: Samridhi Gupta <samridhiguptaa02@gmail.com>
Date: Wed, 5 Jun 2024 10:46:19 +0530
Subject: [PATCH 1/2] done

---
 .DS_Store     | Bin 8196 -> 0 bytes
 img/.DS_Store | Bin 6148 -> 0 bytes
 index.html    |   4 ++--
 story.html    |  12 ++++++------
 4 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 .DS_Store
 delete mode 100644 img/.DS_Store

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index de5802a7ce7470b6dbb1889a43a1951b1e2bbc84..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8196
zcmeHMTWl0n7(U;$rDvD`Q)H!3U>B=gH`3D5fCz4Pi*hNpvMs%EDSH`U!gOZYncad-
zW7X&bsBhk)#wRt=h|vfkULJhVc#9^aA!1_iRf8tJXw<~`pE<Ko3e`75WKJ^YKmYB_
z{QrFaoIPh5V@Q_r&5YGE#yDMq>Kb*|X+kfqYnl>BYKVgTnOn$OPL{Z{*}^r}p&-ma
zn1L_@VFtnsgc-OIGC*s#XndM=UuwfX%s`ldn=%99`w*i`&_qDTCG|fY)cIQgqSYk!
z8;x}_AQ}s3BB0}vl7<?jD^cl+V2c6iPV!h_mk8*%q|%)s*nA+kGlCro{JYcqG2fga
zA!*o$83;3QZ3e{Ny^5J^m>tTFOy0j+rt38|orh9YT{EMW*K&>TOCNSd(q6_Zxyej%
zkKlS7$I4d5ne1-U7#Y&%r5xMKn6^>$9n8EzCVTr#JMWAnosyk*ec!ZHaFwe=dj06=
z+UAyctfjSWEFK%(u(l~4Yi(&88&i3tam~hELr1J(+c_ZvK=2V@v!(=e@=7#$H)mz(
z>4ZfPpyifR@_?c$mMzEtzpVtQ&eXJ7k>1_Cef<MNx?XaPU51tM%(Bsu@eFrJpW{-z
z+j5TGT{OxRXJ5{-O2am3>T($?S0ZDh-Llf=gVH)zbS$geaZS&3?16sIIOYkRnCL21
z|Dfv>y_7#$ze)2;tGVJHT?OIn?ly`pQB^%Pd;X%OcdS~|x?ywbzRvE6IeOjPTjoWy
zK}x0VnFmdy*gIn8y~6_;H)q&+(>~N!HeEAo89jDp*r-!#xjHddubUHD5NY6gBkwO|
z&7&pLJMK%hC6Sn_pXPh>6wFR1FJ{b3`z4XvIo~7XsiHx>6l=>PD^)$idt3@lP7&Ac
zRCQPFIYRGSx;ASqT+ge$Rwip$Qq-oc=lTw{uPh^z!j0M{UWd5apL2$XDIQmf6Okm>
zKjr(yy*o3m*Htj=D^GPV=L161p3jp|BxLKhNMz7GoGBVzBZNWy9Ou4#C&~TSNE$KE
zmb~dX#X$LhuhdPuY!bjJ*%IfR^TrCs8WStz&`)J!qDgYPSh^OoCYEH|*?v}F$Jt5t
z411Zq%TBX1>|^#7yTC58AJ{MKSN1#mgZ+tW)Swm|by$c7EXES7Ml05#4N2@kC+<fV
zdaw`saR3<{go6T#aB&=u;88q=$MF=N#dCN8FX9!P!drM7@8BbRjxX>f&f_9}#3lTM
zpYfZbDl-*LnWrpQRwyf#RZ5F;x6-a`m(Q+L3TdzsWFYS(dZlWDV?E{R>sL*5>$a`i
zcdWZ%tLDP&piXX`9}~s1epB)?#3U#yIGl`cAJSJ9f)8o`<xj<8{ep!Jixz9qUc$U_
zY`PNEYX!Rbgs@(En-<k;s4678Y&o$rs3Ii0Iv$Pc3KgPco0_AVUPWc5`o8Pp#3Eoe
z+@)!HH5HsX(Xe1)y>?HuT@_`nGv7AVK{JW+`F9}yBaA;|=h!#wdv=Ln{1>VSyz>#m
zGQ<hAn~^{Y9oRy^?Zz&oeeezubhF68f=%!}N&p_k7#_kn9>xhgfhT<sKktM1CA^B)
z@H*bWn>d5Bcn|O61AK^2@HHl;Kvh6<Qp0z|1W+xfi?-$1he%QZ_9V-2I3)vBlCKy0
z|1Hy>|4;D>*)RiP2L4YOKy^pDBS{fW_t6x4?HFAL=n_rXjZ5mgP<Pcq0P&aqFr;ye
fOodM(pyQH~gxY_85D>2a)BKPP*MA?7H%a$5&?ieW

diff --git a/img/.DS_Store b/img/.DS_Store
deleted file mode 100644
index b63407ed29857d5e9f79e4881d6acc56a4f39f18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKO-sW-5Pe&FsCenoV}5}_^aq4eZz4kdII6Xw1RGP@RPdIc?wi@67@{aWNRb(s
zeY>;s_Tw#NvjD<qGdl%_00wly-XV)GO!~z;*0YFU&@pl>@PIcIn02x}u#XDJ*$q)+
zg(sfd=kv=^;RGd?IA7M&%gwr8G4~b|ykkv9&b}0P%vxZ>dd_HyF~_OtDKpoMtu*><
z44L7T^@`=0W((_ujEeIJyWPGfzrtKsS8|SmygBo3TI;<hYszs7T~$gfHS2dfyRx1A
zsKP!TpRdUka0Og}ofP1mEjBoc=%p**3b+DW1?2mX&;>KYCZc{iSm+ag*k@Rcb$Lq&
zCo#+nn~3b8g-9hvYOp6ph;+si%gYR#h>?z<Gjkl9IoJy&=<JLqnvRe~^wJe@1=<Q6
z#O6@$|BLV6|80`DTme_$Unvm!<H>l$E!o}L*__<93H^~SCV5T7Erk`mikT}{@iASE
Y@kA=b%&>{b2+e;4R0c0xfj?E?1LgupI{*Lx

diff --git a/index.html b/index.html
index 613dda5c..05bc4ebc 100644
--- a/index.html
+++ b/index.html
@@ -877,7 +877,7 @@ <h4 class="footer__subtitle">Support</h4>
           <a href="./faq.html" class="footer__link">FAQs</a>
           <a href="./tnc.html" class="footer__link">Terms & Conditions</a>
           <a href="./privacy.html" class="footer__link">Privacy Policy</a>
-          <p class="footer__text">Contact Us</p>
+          <p><a href="#cnt-form" class="footer__link">Contact Us</a></p>
         </div>
         <div class="footer__col">
           <h4>Address</h4>
@@ -907,7 +907,7 @@ <h4>Address</h4>
         </div>
         <div class="footer__col">
           <h4>Reach Out To Us</h4>
-          <p><span>Email:</span> tour@tourguide.com</p>
+          <p><span>Email:</span><a href="mailto::tour@tourguide.com"> tour@tourguide.com</a></p>
           <p><span>Phone:</span> +91 8562145852</p>
         </div>
       </div>
diff --git a/story.html b/story.html
index b50b689c..d277c33e 100644
--- a/story.html
+++ b/story.html
@@ -95,18 +95,18 @@ <h3>Tourguide<span>.</span></h3>
           </p>
         </div>
         <div class="footer__col">
-          <h4>Support</h4>
-          <p>FAQs</p>
-          <p>Terms & Conditions</p>
-          <p>Privacy Policy</p>
-          <p>Contact Us</p>
+         <h4>Support</h4>
+          <p><a href="./faq.html">FAQs</a></p>
+          <p><a href="./tnc.html">Terms & Conditions</a></p>
+          <p><a href="./privacy.html">Privacy Policy</a></p>
+          <p><a href="index.html#cnt-form">Contact US</a></p>
         </div>
         <div class="footer__col">
           <h4>Address</h4>
           <p>
             <span>Address:</span> 3/2 Wellington Street, Kolkata , West Bengal , India 
           </p>
-          <p><span>Email:</span> tour@tourguide.com</p>
+          <p><span>Email:</span><a href="mailto:tour@tourguide.com">tour@tourguide.com</a></p>
           <p><span>Phone:</span> +91 8562145852</p>
         </div>
       </div>

From 0c4e63dc656f398c03513e51ebd2799443a75c02 Mon Sep 17 00:00:00 2001
From: Samridhi Gupta <samridhiguptaa02@gmail.com>
Date: Wed, 5 Jun 2024 11:39:37 +0530
Subject: [PATCH 2/2] Resolved merge Conflict

---
 index.html | 10 +++++-----
 story.html |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/index.html b/index.html
index 05bc4ebc..d0b0e56b 100644
--- a/index.html
+++ b/index.html
@@ -872,12 +872,12 @@ <h3 class="footer__title">Tourguide<span>.</span></h3>
             can find your right destination.
           </p>
         </div>
-        <div class="footer__col">
+        <div class="footer__area">
           <h4 class="footer__subtitle">Support</h4>
-          <a href="./faq.html" class="footer__link">FAQs</a>
-          <a href="./tnc.html" class="footer__link">Terms & Conditions</a>
-          <a href="./privacy.html" class="footer__link">Privacy Policy</a>
-          <p><a href="#cnt-form" class="footer__link">Contact Us</a></p>
+          <p><a href="./faq.html" class="footer__link">FAQs</a></p>
+          <p><a href="./tnc.html" class="footer__link">Terms & Conditions</a></p>
+          <p><a href="./privacy.html" class="footer__link">Privacy Policy</a></p>
+          <p><a href="#cnt-form" class="footer__link">Contact</a></p>
         </div>
         <div class="footer__col">
           <h4>Address</h4>
diff --git a/story.html b/story.html
index d277c33e..d647fc5b 100644
--- a/story.html
+++ b/story.html
@@ -94,12 +94,12 @@ <h3>Tourguide<span>.</span></h3>
             can find your right destination.
           </p>
         </div>
-        <div class="footer__col">
+        <div class="footer__area">
          <h4>Support</h4>
           <p><a href="./faq.html">FAQs</a></p>
           <p><a href="./tnc.html">Terms & Conditions</a></p>
           <p><a href="./privacy.html">Privacy Policy</a></p>
-          <p><a href="index.html#cnt-form">Contact US</a></p>
+          <p><a href="./index.html#cnt-form">Contact US</a></p>
         </div>
         <div class="footer__col">
           <h4>Address</h4>