merge fix

docs/md_files/contributor.md

@@ -7,11 +7,6 @@ Dr. Jiaqi Ma (Associate Professor @ UCLA)
 - [Linkedin](https://www.linkedin.com/in/jiaqi-ma-17037838/)
 - [Google Scholar](https://scholar.google.com/citations?user=S3cQz1AAAAAJ&hl=en)
 
-### Supervisor
-Dr. Jiaqi Ma (Associate Professor @ UCLA)
-- Project and lab supervisor
-- [Linkedin](https://www.linkedin.com/in/jiaqi-ma-17037838/)
-- [Google Scholar](https://scholar.google.com/citations?user=S3cQz1AAAAAJ&hl=en)
 
 ### Core Developer
 Runsheng Xu (Ph.D. Student @ UCLA):
@@ -33,11 +28,6 @@ Dr. Xin Xia (Postdoc @ UCLA):
 - [Linkedin](https://www.linkedin.com/in/xin-xia-3b6589189/)
 
 Dr. Yi Guo (Postdoc @ UC):
-<<<<<<< HEAD
-- SUMO Integration, platooning algorithm, SUMO Only Mode (under dev)
-- [Linkedin](https://www.linkedin.com/in/yi-guo-4008baaa/)
-=======
-- Help on Sumo part
+- Platooning algorithm, SUMO Only Mode (under dev)
 - [Linkedin](https://www.linkedin.com/in/yi-guo-4008baaa/)
 
->>>>>>> 232a18fe1724891b03327ab54f14f5849ae11214

docs/md_files/introduction.md

@@ -1,12 +1,7 @@
 ## OpenCDA Overview
 Current autonomous driving simulation platforms that support scene rendering and traffic simulation mainly concentrate
-<<<<<<< HEAD
 on single-vehicle intelligence; therefore, developing and testing Cooperative Driving Automation applications (e.g., cooperative perception, 
 platooning, signalized intersection approach and departure) under a realistic simulated environment becomes difficult.
-=======
-on single-vehicle intelligence, therefore, developing and testing Cooperative Driving Automation applications (e.g., cooperative perception,
-cooperative merge) under a realistic simulated environment becomes difficult.
->>>>>>> 232a18fe1724891b03327ab54f14f5849ae11214
 
 OpenCDA is created to fill such gaps.