diff --git a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js b/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js
index fe52f1c55e5562ae62af6f0009c72c7b8ab90746..eba4463acde60ec6385e0b81c055ec57a45eb854 100644
--- a/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js
+++ b/miscservices/TimeTest_js/src/main/js/default/test/SystemTimeJsunit.test.js
@@ -1745,7 +1745,11 @@ describe('TimeTest', function() {
      */
     it('systemTime_setTimezone_test29', 0, async function (done) {
         console.log("SUB_systemTime_setTimezone_JS_API_2900 start")
+<<<<<<< HEAD
         systemTime.setTimezone("AAAAAAAAAAAAAAAAAAAAAAAAAA")
+=======
+        systemTime.setTimezone("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA")
+>>>>>>> 67cddaeb9d46468d0842acd9543d07c76b15457e
             .then(data =>{
             console.log("setTimezone ===data " + data)
         }).catch(error => {