Fixed Error

src/pages/Biography.tsx

@@ -21,7 +21,7 @@ import { BioInfo, getMessage } from '../data/BioInfo';
 import './Biography.css';
 import EnciclopediaPR from '../assets/EnciclopediaPR.png';
 import RobertoClemente from '../assets/RobertoClemente.jpg';
-import { clipboardOutline } from 'ionicons/icons';
+import { square } from 'ionicons/icons';
 
 const Biography: React.FC = () => {
     const [bioinfo, setMessage] = useState<BioInfo>();
@@ -63,7 +63,6 @@ const Biography: React.FC = () => {
                         </IonItem>
                         <p>{bioinfo.Text1}</p>
                         <p>{bioinfo.Text2}</p>
-<<<<<<< HEAD
                         <p>{bioinfo.Text3}</p>
                         <p>{bioinfo.Text4}</p>
                         <p>{bioinfo.Text5}</p>
@@ -76,10 +75,6 @@ const Biography: React.FC = () => {
                         <p> </p>
                         <IonItem routerLink={`/Question`} detail={true}>
                             <IonIcon icon={square} />Tomar quiz
-=======
-                        <IonItem routerLink={`/Question/${bioinfo.id}`} detail={true}>
-                            <IonIcon icon={clipboardOutline} />Tomar quiz
->>>>>>> 649fe9bb4c20a7971dad4ef1f02ae2169dc8b438
                         </IonItem>
                     </>
                 ) : (