diff --git a/Teams/Gundam/ABOUT.md b/Teams/Gundam/ABOUT.md
index 616c3d4..a59def8 100644
--- a/Teams/Gundam/ABOUT.md
+++ b/Teams/Gundam/ABOUT.md
@@ -34,10 +34,7 @@ Cherry is an engineering student at the University of Waterloo, and has a lot of
 Fan
 =======
 Fan is an ambitious engineer at the University of Waterloo, and has been doing front-end web development, and also recently back-end development as well (PHP and MySQL). He will be one of the engineers on this team. He also really likes Gundam. [Website](http://thefanzhang.com/)
-<<<<<<< HEAD
 
 Tommy
 =======
 Tommy just recently started app development and web development, and he has fallen in love with it. He is an engineer at the University of Waterloo, and has learned a lot of languages very quickly, including python, iOS development, html, css, and JavaScript.
-=======
->>>>>>> 784175de43380cc1ae4cd1ad6cd4a07ed39bc008