diff --git a/misc/drupal.js b/misc/drupal.js
index e9c1c373dfa..d9e70654958 100644
--- a/misc/drupal.js
+++ b/misc/drupal.js
@@ -66,15 +66,9 @@ function HTTPGet(uri, callbackFunction, callbackParameter) {
 
 /**
  * Creates an HTTP POST request and sends the response to the callback function
-<<<<<<< drupal.js
  *
  * Note: passing null or undefined for 'object' makes the request fail in Opera 8.
  *       Pass an empty string instead.
-=======
- *
- * Note: passing null or undefined for 'object' makes the request fail in Opera.
- *       Pass an empty string instead, if you must.
->>>>>>> 1.12
  */
 function HTTPPost(uri, callbackFunction, callbackParameter, object) {
   var xmlHttp = new XMLHttpRequest();