diff --git a/lib/jsdav.js b/lib/jsdav.js
index <HASH>..<HASH> 100644
--- a/lib/jsdav.js
+++ b/lib/jsdav.js
@@ -74,7 +74,6 @@ exports.createServer = function(options, port, host) {
     return DAV.createServer(options, port, host);
 };
 
-<<<<<<< Updated upstream
 /**
  * Create a jsDAV Server object that will not fire up listening to HTTP requests,
  * but instead will respond to requests that are passed to 
@@ -95,13 +94,7 @@ exports.createServer = function(options, port, host) {
 exports.mount = function(options) {
     var DAV = require("./DAV/server");
     DAV.debugMode = exports.debugMode;
-    return DAV.mount(options);
-=======
-exports.mount = function(options) {
-    var DAV = require("./DAV/server");
-    DAV.debugMode = exports.debugMode;
     return DAV.mount(options.path, options.mount, options.server, options.standalone);
->>>>>>> Stashed changes
 };
 
 //@todo implement CalDAV
Typo produced in merge feature/python