diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 77beabf904..5149dc3b21 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -489,10 +489,6 @@ function dfrn_poll_content(&$a) {
 						dbesc($session_id)
 					); 
 				}
-<<<<<<< HEAD
-=======
-				
->>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
 			
 				goaway($dest);
 			}