diff --git a/network/get_url b/network/get_url
index 7cc1c5227ec..53b07261479 100644
--- a/network/get_url
+++ b/network/get_url
@@ -89,7 +89,6 @@ author: Jan-Piet Mens
 '''
 
 EXAMPLES='''
-<<<<<<< HEAD
 - name: download foo.conf
   get_url: url=http://example.com/path/file.conf dest=/etc/foo.conf mode=0440