diff --git a/.env.dist b/.env.dist
index a9fe4b6a..b0392b88 100644
--- a/.env.dist
+++ b/.env.dist
@@ -28,6 +28,8 @@ RT_SHORTCODE=1234
 MQTT_IP_ADDRESS=localhost
 MQTT_PORT=8883
 MQTT_CERT=/location/of/cert/file.crt
+MQTT_WS_HOST=insertiphere
+MQTT_WS_PORT=8083
 
 # redis client
 REDIS_CLIENT_SCHEME=tcp
diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index e1949091..abbc833b 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -931,7 +931,6 @@ class RAPIController extends Controller
         return $res->getReturnResponse();
     }
 
-<<<<<<< HEAD
     protected function updateVehicleBattery(JobOrder $jo)
     {
         // check if new battery
@@ -983,7 +982,7 @@ class RAPIController extends Controller
             ->setHasMotoliteBattery(true)
             ->setWarrantyExpiration($warr_date);
     }
-=======
+
     protected function createWarranty($jo)
     {
         $em = $this->getDoctrine()->getManager();
@@ -1057,7 +1056,4 @@ class RAPIController extends Controller
         $expire_date->add(new DateInterval('P'.$warranty_period.'M'));
         return $expire_date;
     }
-
-
->>>>>>> 0297d66dd56b2b01db9c618c32e2367223048a56
 }
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 7bdcc8bb..1b043791 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -96,7 +96,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_mobile">Mobile Phone</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_mobile" id="customer-phone-mobile" class="form-control m-input" value="{{ obj.getCustomer.getPhoneMobile|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_mobile"></div>
                                         </div>
@@ -104,7 +104,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_landline">Landline</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_landline" id="customer-phone-landline" class="form-control m-input" value="{{ obj.getCustomer.getPhoneLandline|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_landline"></div>
                                         </div>
@@ -114,7 +114,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_office">Office Phone</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_office" id="customer-phone-office" class="form-control m-input" value="{{ obj.getCustomer.getPhoneOffice|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_office"></div>
                                         </div>
@@ -122,7 +122,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_fax">Fax</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_fax"></div>
                                         </div>
diff --git a/templates/job-order/form.onestep.html.twig b/templates/job-order/form.onestep.html.twig
index c9e14254..f7a60b1f 100644
--- a/templates/job-order/form.onestep.html.twig
+++ b/templates/job-order/form.onestep.html.twig
@@ -94,7 +94,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_mobile">Mobile Phone</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_mobile" id="customer-phone-mobile" class="form-control m-input" value="{{ obj.getCustomer.getPhoneMobile|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_mobile"></div>
                                         </div>
@@ -102,7 +102,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_landline">Landline</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_landline" id="customer-phone-landline" class="form-control m-input" value="{{ obj.getCustomer.getPhoneLandline|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_landline"></div>
                                         </div>
@@ -112,7 +112,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_office">Office Phone</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_office" id="customer-phone-office" class="form-control m-input" value="{{ obj.getCustomer.getPhoneOffice|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_office"></div>
                                         </div>
@@ -120,7 +120,7 @@
                                     <div class="col-lg-6">
                                         <label data-field="customer_phone_fax">Fax</label>
                                         <div class="input-group m-input-group">
-                                            <span class="input-group-addon">+63</span>
+                                            <span class="input-group-addon">{% trans %}country_code_prefix{% endtrans %}</span>
                                             <input type="text" name="customer_phone_fax" id="customer-phone-fax" class="form-control m-input" value="{{ obj.getCustomer.getPhoneFax|default('') }}" data-vehicle-field="1" disabled>
                                             <div class="form-control-feedback hide" data-field="customer_phone_fax"></div>
                                         </div>
diff --git a/translations/messages.en.yaml b/translations/messages.en.yaml
index 827eb65b..04ebdc42 100644
--- a/translations/messages.en.yaml
+++ b/translations/messages.en.yaml
@@ -9,14 +9,9 @@ battery_size_tradein_brand: Trade-in Motolite
 battery_size_tradein_premium: Trade-in Premium
 battery_size_tradein_other: Trade-in Other
 add_cust_vehicle_battery_info: This vehicle is using a Motolite battery
-<<<<<<< HEAD
-jo_title_pdf: Motolite Res-Q Job Order
-country_code_prefix: '+63'
-=======
 jo_title_pdf: Res-Q for CMB Job Order
 country_code_prefix: '+60'
 delivery_instructions_label: 'Delivery Instructions - CarFix Job Order No.'
->>>>>>> 0297d66dd56b2b01db9c618c32e2367223048a56
 
 # images
 image_logo_login: /assets/images/black-text-logo-01.png