diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.jag
index 08576f2a..d191882d 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/lib/fuse.jag
@@ -11,14 +11,9 @@ File.prototype.getPath = function() {
 var fuseState = {
     zones: {},
     appName: '',
-<<<<<<< HEAD
-    zoneStack: [],
-    currentUnit: null
-=======
     currentZone: [], //TODO: rename to zone Stack
     currentUnit: null,
     viewModelCache:{}
->>>>>>> e27279a83b0f9a100b0a1df5ec6c63bf9b7dbf8e
 };
 
 var requestId = function makeId() {
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/test.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/test.jag
deleted file mode 100644
index c0097b63..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/test.jag
+++ /dev/null
@@ -1,12 +0,0 @@
-<%
-var userModule = require("/modules/user.js").userModule;
-userModule.addPermissions([{key: "device-mgt/", name: "Device Management"}], "");
-userModule.addPermissions([{key: "device-mgt/admin", name: "Device Management Admin"}], "");
-userModule.addPermissions([{key: "device-mgt/user", name: "Device Management User"}], "");
-
-userModule.addPermissions([{key: "devices", name: "Device"}], "device-mgt/admin");
-userModule.addPermissions([{key: "devices", name: "Device"}], "device-mgt/user");
-userModule.addPermissions([{key: "devices/list", name: "List all Devices"}], "device-mgt/admin");
-userModule.addPermissions([{key: "devices/list", name: "List own Devices"}], "device-mgt/user");
-new Log().info(userModule.isAuthorized("/permission/device-mgt/admin/devices/list"));
-%>
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/token.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/token.jag
deleted file mode 100644
index 77778307..00000000
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/token.jag
+++ /dev/null
@@ -1,4 +0,0 @@
-<%
-var apiWrapperUtil = require("/modules/api-wrapper-util.js").apiWrapperUtil;
-apiWrapperUtil.refreshToken();
-%>
\ No newline at end of file