diff --git a/persistence-modules/java-jpa-2/README.md b/persistence-modules/java-jpa-2/README.md
index fb6ef5d8f8..579dcbdab0 100644
--- a/persistence-modules/java-jpa-2/README.md
+++ b/persistence-modules/java-jpa-2/README.md
@@ -1,7 +1,4 @@
 # Relevant Articles
-<<<<<<< HEAD
 
 - [JPA Query Parameters Usage](http://www.baeldung.com/jpa-query-parameters-usage)
-=======
->>>>>>> refs/heads/master
 - [Mapping Entitiy Class Names to SQL Table Names with JPA](https://www.baeldung.com/jpa-entity-table-names)