diff --git a/doc/src/pair_meam_spline.txt b/doc/src/pair_meam_spline.txt
index 086854a0eb..6653b397a0 100644
--- a/doc/src/pair_meam_spline.txt
+++ b/doc/src/pair_meam_spline.txt
@@ -164,9 +164,5 @@ for more info.
 Kress, Modelling Simulation Materials Science Engineering, 8, 825
 (2000).
 
-<<<<<<< HEAD
 :link(Zhang4)
-=======
-:link(Zhang2)
->>>>>>> Documentation V1
 [(Zhang)] Zhang and Trinkle, Computational Materials Science, 124, 204-210 (2016).