diff --git a/js/msp.js b/js/msp.js
index 6074a5f8..56ace049 100644
--- a/js/msp.js
+++ b/js/msp.js
@@ -1353,7 +1353,6 @@ MSP.sendServoConfigurations = function(onCompleteCallback) {
     }
 
 
->>>>>>> cleanflight/development
     function send_next_servo_configuration() {
         
         var buffer = [];