Fixed the merge conflicts

src/components/faq/index.js

@@ -9,6 +9,9 @@ import {
   Collapse,
   IconButton,
 } from "@material-ui/core";
+import {
+  Link,
+} from "react-router-dom";
 import { makeStyles } from "@material-ui/core/styles";
 import KeyboardArrowRightIcon from "@material-ui/icons/KeyboardArrowRight";
 import clsx from "clsx";
@@ -26,9 +29,8 @@ const createStyles = makeStyles({
 });
 
 export default function Faq(props) {
-  const question = props.question;
-  const answer = props.answer;
-  const color = props.color;
+
+  const { question, answer, questionNumber } = props;
 
   const classes = createStyles(props);
 
@@ -61,7 +63,10 @@ export default function Faq(props) {
           unmountOnExit
           className={classes.answer}
         >
-          <CardContent className={classes.text}>{answer}</CardContent>
+          <CardContent className={classes.text}>
+            {answer}
+            {questionNumber === 11 ? <Link to='/contactus'>location page for more information</Link> : null}
+          </CardContent>
         </Collapse>
       </Card>
     </>

src/json/faqs.json

@@ -2,51 +2,51 @@
   "data": [
     {
       "question": "Is it now mentored by NIT Trichy?",
-      "answer": "No, IIIT Tiruchirappalli is now not mentored by NIT Trichy."
+      "answer": "No, NIT Trichy does not mentor IIIT Tiruchirappalli now."
     },
     {
       "question": "Faculties: NIT Trichy or IIIT Trichy?",
-      "answer": "The classes and industrial training for the CSE and ECE Program are handled by faculty members from IIIT Trichy."
+      "answer": "Faculty members from IIIT Trichy handle classes and industrial training for CSE and ECE Programs."
     },
     {
       "question": "Hostel : Within campus or the private one?",
-      "answer": "The hostel is located in Permanent campus Sethurappatti."
+      "answer": "Hostel is located in Permanent campus at Sethurappatti."
     },
     {
       "question": "Placement: With NIT Trichy or separate?",
-      "answer": "The Department of Training and Placement is functioning seperately in IIITT since July 2017."
+      "answer": "Training and Placement Cell functions separately in IIITT since July 2017."
     },
     {
       "question": "When will IIIT Trichy shift to its permanent campus?",
-      "answer": " As of June 14, 2021 IIIT Tiruchirappalli has shifted from Oxford engineering college campus to Permanent Campus Sethurappatti."
+      "answer": "As of June 14, 2021, IIIT Tiruchirappalli was shifted from Oxford Engineering College campus to its Permanent Campus at Sethurappatti."
     },
     {
       "question": "Does IIIT Trichy comes under JoSAA or do I have to apply separately?",
       "answer": "IIIT Trichy comes under JoSAA. It follows all the rules and regulations of JoSAA and takes part in online common counselling conducted by JoSAA."
     },
     {
       "question": "Is there a Home State Quota at IIIT Trichy?",
-      "answer": "No. There is no Home State Quota in IIIT Trichy. The admission is only based on All India Quota by following reservation policy by Government of India."
+      "answer": "IIIT Trichy does not have Home State Quota provision. The admission is only based on All India Quota by following reservation policy of Government of India."
     },
     {
       "question": "Why there is no Information Technology Program (IT Program) in IIIT Trichy?",
-      "answer": "From the Academic Year 2016-17 onwards admission to IT Program is temporarily suspended due to the transition of Mentor Institute to NIT Trichy."
+      "answer": "From the Academic Year 2016-17 onwards, admission to IT Program is temporarily suspended due to change of Mentoring Institute to NIT Trichy."
     },
     {
       "question": "Do IIIT Trichy students take part in events of NIT Trichy?",
-      "answer": "Yes, IIIT Trichy students do take part in the events of NIT Trichy which are open for everyone, like Festember and Pragyan. However, we do not, and can not take part in their internal events like NITTFEST."
+      "answer": "Yes, IIIT Trichy students do take part in the events of NIT Trichy, which are open for everyone, like Festember and Pragyan. However, we do not, and cannot take part in their internal events like NITTFEST."
     },
     {
       "question": "Apart from academics, how would a student be occupied?",
-      "answer": "IIITT as an institute stimulates the student’s advancement in every field. There are various activities pertaining to technical, cultural and sports, such as clubs, competitions and fests, so that students aren’t only indulged in academics, but also involve themselves in extra-curricular activities to discover themselves and for the overall development of the student."
+      "answer": "IIITT as an institute stimulates the student’s advancement in every field. There are various activities pertaining to technical, cultural and sports, such as clubs, competitions and fests, so that students aren’t only indulged in academics, but also involve themselves in extra-curricular activities to discover their talents which will be helpful for overall development of the student."
     },
     {
-      "question": "Societies and clubs of the Institute?",
-      "answer": "The Institute has myriad clubs operating under three main categories: Technical, Cultural and Sports. Some of the clubs are: Technical - Web Dev Club, Competitive Coding(CC), Net Sec ( Network Security), IoT and many more clubs. Cultural – Dance, Photography, Fine Arts Clubs and many more. Sports – Cricket, Basketball, Badminton Clubs and many more. (Refer the Clubs page on the website for more info)"
+      "question": "Are there Societies and clubs in the Institute?",
+      "answer": "The Institute has myriad clubs operating under three main categories: Technical, Cultural and Sports. Some of the clubs are: Technical - Web Dev Club, Competitive Coding(CC), Net Sec (Network Security), IoT and many more clubs.
Cultural-Dance, Photography, Fine Arts Clubs and many more, Sports-Cricket, Basketball, Badminton Clubs and many more.
(Refer the Clubs page on the Institute website for more info)."
     },
     {
       "question": "How to reach IIIT Trichy?",
-      "answer": " IIIT Trichy is operating in the Permanent campus from June 14, 2021. (For more, visit contact us page on website.)"
+      "answer": "IIIT Trichy is operating in the Permanent campus from June 14, 2021. Please visit "
     }
   ]
 }

src/pages/faqs/index.js

@@ -64,10 +64,10 @@ export default function Faqs() {
             </Box>
           </Typography>
           {data &&
-            data.map((faq) => {
+            data.map((faq, index) => {
               return (
                 <div className={classes.faq}>
-                  <Faq question={faq.question} answer={faq.answer} />
+                  <Faq questionNumber={index} question={faq.question} answer={faq.answer} />
                 </div>
               );
             })}