diff --git a/components/ueber-uns/teamCard.js b/components/ueber-uns/teamCard.js
index ea9f8ab..4fd0a9c 100644
--- a/components/ueber-uns/teamCard.js
+++ b/components/ueber-uns/teamCard.js
@@ -1,17 +1,11 @@
-<<<<<<< HEAD
-=======
 import Image from "next/image";
->>>>>>> f3ee49c9d2058fe0393ebe2c170d08faab6e1f34
 import React from "react";
 
 const TeamCard = (props) => {
 	return (
 		<div>
-<<<<<<< HEAD
 			<img src={props.image} alt="ProfileImage" />
-=======
 			<Image src={props.imgUrl} alt="ProfileImage" width={125} height={125} />
->>>>>>> f3ee49c9d2058fe0393ebe2c170d08faab6e1f34
 			<div>
 				<h2>{props.name}</h2>
 				<h3>{props.stellung}</h3>