Fix merge conflicts

Author: nosir

src/Cleave.js

@@ -307,7 +307,7 @@ Cleave.prototype = {
         if (pps.prefix) {
             if (pps.tailPrefix) {
                 value = value + pps.prefix;
-            } else if(value !== pps.prefix) {
+            } else {
                 value = pps.prefix + value;
             }
 

src/Cleave.react.js

@@ -359,7 +359,7 @@ var cleaveReactClass = CreateReactClass({
         if (pps.prefix) {
             if (pps.tailPrefix) {
                 value = value + pps.prefix;
-            } else if (value !== pps.prefix) {
+            } else {
                 value = pps.prefix + value;
             }