diff --git a/update.bat b/update.bat
index 46ef323f0223fbdc2a151c7c4b1395ee786ca135..4c2c1d8440cea34d3008551ad39242189dd0a26d 100644
--- a/update.bat
+++ b/update.bat
@@ -4,7 +4,11 @@ echo Update Vitis App
 
 call utils/update_tree.bat
 
+<<<<<<< HEAD
 cd client/conf
+=======
+cd ../client/conf
+>>>>>>> 7b0e04e0777792e9cf713c50f58351a7f721d3af
 call grunt
 
 pause