diff --git a/lib/api/host.js b/lib/api/host.js
index 2acb138..7a88c93 100644
--- a/lib/api/host.js
+++ b/lib/api/host.js
@@ -43,7 +43,6 @@ function mute(hostname, options, callback){
     client.request("POST", util.format("/host/%s/mute", hostname), params, callback);
 }
 
-
 /*section: host
  *comment: unmute the given host, if it is not already unmuted
  *params:
diff --git a/lib/api/monitor.js b/lib/api/monitor.js
index 44f4c9a..b30a768 100644
--- a/lib/api/monitor.js
+++ b/lib/api/monitor.js
@@ -294,10 +294,15 @@ function unmute(monitorId, scope, callback){
             scope: scope
         };
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
     } else {
         params.body = "";  // create empty body
 >>>>>>> 5243bf7... add params.body default to client.prototype.request
+=======
+    } else {
+        params.body = "";
+>>>>>>> 4818053... add params.body default to mute() and unmute()
     }
     client.request("POST", util.format("/monitor/%s/unmute", monitorId), params, callback);
 }