diff --git a/src/main/java/org/springframework/hateoas/MediaTypes.java b/src/main/java/org/springframework/hateoas/MediaTypes.java
index af118e05..6c16f741 100644
--- a/src/main/java/org/springframework/hateoas/MediaTypes.java
+++ b/src/main/java/org/springframework/hateoas/MediaTypes.java
@@ -22,10 +22,7 @@ import org.springframework.http.MediaType;
  * 
  * @author Oliver Gierke
  * @author Przemek Nowak
-<<<<<<< HEAD
  * @author Drummond Dawson
-=======
->>>>>>> f5bf966... #340 - Add new Affordances API + HAL-FORMS mediatype.
  * @author Greg Turnquist
  */
 public class MediaTypes {