diff --git a/TeensyPwm.cpp b/TeensyPwm.cpp
index ef7516d..219168f 100644
--- a/TeensyPwm.cpp
+++ b/TeensyPwm.cpp
@@ -10,7 +10,11 @@
 
 
 
+<<<<<<< local
+volatile float U_des = 12.0;
+=======
 volatile float u_des = 14.0;
+>>>>>>> other