diff --git a/baseTemplate/urls.py b/baseTemplate/urls.py
index 491d5baa1..ad11d2197 100755
--- a/baseTemplate/urls.py
+++ b/baseTemplate/urls.py
@@ -8,7 +8,6 @@ urlpatterns = [
     url(r'^getLoadAverage',views.getLoadAverage, name='getLoadAverage'),
     url(r'^versionManagment',views.versionManagment, name='versionManagment'),
     url(r'^design', views.design, name='design'),
-    url('^Filemanager', views.FileManager,  name='Filemanager'),
     url(r'^getthemedata', views.getthemedata, name='getthemedata'),
 
     #url(r'^upgrade',views.upgrade, name='upgrade'),
diff --git a/baseTemplate/views.py b/baseTemplate/views.py
index b3dd303dc..4320fbac0 100755
--- a/baseTemplate/views.py
+++ b/baseTemplate/views.py
@@ -298,50 +298,3 @@ def getthemedata(request):
         final_json = json.dumps(final_dic)
         return HttpResponse(final_json)
 
-
-def FileManager(request):
-<<<<<<< HEAD
-    ### Load Custom CSS
-    try:
-        from baseTemplate.models import CyberPanelCosmetic
-        cosmetic = CyberPanelCosmetic.objects.get(pk=1)
-    except:
-        from baseTemplate.models import CyberPanelCosmetic
-        cosmetic = CyberPanelCosmetic()
-        cosmetic.save()
-
-    userID = request.session['userID']
-    currentACL = ACLManager.loadedACL(userID)
-    ipFile = "/etc/cyberpanel/machineIP"
-    f = open(ipFile)
-    ipData = f.read()
-    ipAddressLocal = ipData.split('\n', 1)[0]
-
-    url = "http://168.119.15.231:2083/CyberpanelAdOns/Adonpermission"
-    data = {
-        "name": "Filemanager",
-         "IP": ipAddressLocal
-         #"IP": "207.246.94.217"
-    }
-
-
-    response = requests.post(url, data=json.dumps(data))
-    Status = response.json()['status']
-    if(Status == 1):
-        template = 'baseTemplate/FileManager.html'
-    else:
-      return  redirect("https://cyberpanel.net/adons")
-=======
-    val = request.session['userID']
-    currentACL = ACLManager.loadedACL(val)
->>>>>>> d4e55339a16ee8d0b686a3699ac95a485364e69b
-
-    if currentACL['admin'] == 1:
-        pass
-    else:
-        return ACLManager.loadErrorJson('FilemanagerAdmin', 0)
-
-
-    proc = httpProc(request, template,)
-    return proc.render()
-
diff --git a/filemanager/urls.py b/filemanager/urls.py
index 13d6d5f39..20811bc04 100755
--- a/filemanager/urls.py
+++ b/filemanager/urls.py
@@ -7,6 +7,7 @@ urlpatterns = [
     url(r'^controller$',views.controller, name='controller'),
     url(r'^downloadFile$',views.downloadFile, name='downloadFile'),
     url(r'^editFile$', views.editFile, name='editFile'),
+    url('^Filemanager', views.FileManagerRoot, name='Filemanager'),
     url(r'^(?P<domain>(.*))$', views.loadFileManagerHome, name='loadFileManagerHome'),
 
 ]
diff --git a/filemanager/views.py b/filemanager/views.py
index 795a5a734..449d34156 100755
--- a/filemanager/views.py
+++ b/filemanager/views.py
@@ -8,7 +8,6 @@ import json
 from websiteFunctions.models import Websites
 from plogical.acl import ACLManager
 from .filemanager import FileManager as FM
-from plogical.processUtilities import ProcessUtilities
 # Create your views here.
 
 def loadFileManagerHome(request,domain):
@@ -31,7 +30,7 @@ def loadFileManagerHome(request,domain):
 def changePermissions(request):
     try:
         userID = request.session['userID']
-        admin = Administrator.objects.get(pk=userID)
+
         try:
             data = json.loads(request.body)
             domainName = data['domainName']
@@ -225,3 +224,49 @@ def editFile(request):
 
     except KeyError:
         return redirect(loadLoginPage)
+
+def FileManagerRoot(request):
+    ### Load Custom CSS
+    try:
+        from baseTemplate.models import CyberPanelCosmetic
+        cosmetic = CyberPanelCosmetic.objects.get(pk=1)
+    except:
+        from baseTemplate.models import CyberPanelCosmetic
+        cosmetic = CyberPanelCosmetic()
+        cosmetic.save()
+
+    userID = request.session['userID']
+    currentACL = ACLManager.loadedACL(userID)
+    ipFile = "/etc/cyberpanel/machineIP"
+    f = open(ipFile)
+    ipData = f.read()
+    ipAddressLocal = ipData.split('\n', 1)[0]
+
+    try:
+
+        url = "http://platform.cyberpersons.com/CyberpanelAdOns/Adonpermission"
+        data = {
+            "name": "Filemanager",
+             "IP": ipAddressLocal
+        }
+
+        import requests
+        response = requests.post(url, data=json.dumps(data))
+        Status = response.json()['status']
+
+        if(Status == 1):
+            template = 'baseTemplate/FileManager.html'
+        else:
+          return  redirect("https://cyberpanel.net/adons")
+    except BaseException as msg:
+        template = 'baseTemplate/FileManager.html'
+
+
+    if currentACL['admin'] == 1:
+        pass
+    else:
+        return ACLManager.loadErrorJson('FilemanagerAdmin', 0)
+
+    from plogical.httpProc import httpProc
+    proc = httpProc(request, template)
+    return proc.render()