diff --git a/assets/js/setting.js b/assets/js/setting.js
index 35362c3..1068704 100644
--- a/assets/js/setting.js
+++ b/assets/js/setting.js
@@ -1,8 +1,5 @@
 export function _serverUrl() {
-<<<<<<< HEAD
     // sachin commitw
-=======
     // sudheer 1.0 new branch
->>>>>>> 3f581491210a99ac539a898f1cccb5f8fbdb5815
     return 'http://localhost:3086/';
 }
\ No newline at end of file