Fix merge issues and a code review comment. revert unit change that outputs px*px as it is not valid css

lib/less/parser.js

@@ -621,11 +621,10 @@ less.Parser = function Parser(env) {
 
                     args = $(this.entities.arguments);
 
+                    parens--;
                     if (! $(')')) {
-                        parens--;
                         return;
                     }
-                    parens--;
 
                     if (name) { return new(tree.Call)(name, args, index, env.filename, env.rootpath) }
                 },

lib/less/tree/dimension.js

@@ -166,11 +166,13 @@ tree.Unit.prototype = {
   },
 
   toCSS: function () {
-    var i, css = this.numerator.join("*");
-    for (i = 0; i < this.denominator.length; i++) {
-      css += "/" + this.denominator[i];
+    if (this.numerator.length >= 1) {
+        return this.numerator[0];
     }
-    return css;
+    if (this.denominator.length >= 1) {
+        return this.denominator[0];
+    }
+    return "";
   },
   
   compare: function (other) {