diff --git a/lib/options.js b/lib/options.js
index 5050f6b3..6a6f0eb2 100644
--- a/lib/options.js
+++ b/lib/options.js
@@ -24,10 +24,7 @@ YUI.add('options', function (Y) {
     Y.Options = function (args) {
         var options = {
             port: 3000,
-<<<<<<< HEAD
             ip: '127.0.0.1',
-=======
->>>>>>> a5e78482a6930f1319a77bbfa76ff78e129f68a0
             nocode: false
         };
 
@@ -112,7 +109,6 @@ YUI.add('options', function (Y) {
             case '--server':
                 options.server = true;
                 var a = args.shift();
-<<<<<<< HEAD
                 var delim = a.indexOf(':');
                 if (delim >= 0) {
                     var socket = a.split(':');
@@ -120,18 +116,12 @@ YUI.add('options', function (Y) {
                     options.port = socket[1];
                     break;
                 }
-=======
->>>>>>> a5e78482a6930f1319a77bbfa76ff78e129f68a0
                 var p = parseInt(a, 10);
                 if (isNaN(p) || !p) {
                     if (a) {
                         args.unshift(a);
                     }
-<<<<<<< HEAD
                     Y.log('Failed to extract socket, setting to the default 127.0.0.1:3000', 'warn', 'yuidoc');
-=======
-                    Y.log('Failed to extract port, setting to the default :3000', 'warn', 'yuidoc');
->>>>>>> a5e78482a6930f1319a77bbfa76ff78e129f68a0
                 } else {
                     options.port = p;
                 }