diff --git a/app/src/main/assets/about.properties b/app/src/main/assets/about.properties
index af885cc25c..ce9a3ce658 100644
--- a/app/src/main/assets/about.properties
+++ b/app/src/main/assets/about.properties
@@ -1,6 +1,6 @@
-about.version=2.0.0-rc.3
-about.build=2460
-about.date=Wed Sep 19 18:05:02 2018
+about.version=2.0.0-rc.4
+about.build=2518
+about.date=Wed Oct 03 17:14:17 2018
 about.commit=
 about.commitFull=
 about.github=https://github.com/flyve-mdm/flyve-mdm-android-agent
diff --git a/app/src/main/java/org/flyve/mdm/agent/utils/AppThreadManager.java b/app/src/main/java/org/flyve/mdm/agent/utils/AppThreadManager.java
index ad8862de8c..27112e4ce2 100644
--- a/app/src/main/java/org/flyve/mdm/agent/utils/AppThreadManager.java
+++ b/app/src/main/java/org/flyve/mdm/agent/utils/AppThreadManager.java
@@ -62,7 +62,6 @@ private AppThreadManager(MqttAndroidClient client) {
     }
 
     public void add(Context context, JSONObject jsonObj) {
-<<<<<<< HEAD
         if(!item.isEmpty()) {
             for (int i = 0; i < item.size(); i++) {
                 if (item.get(i).toString().trim().contains(jsonObj.toString().trim())) {
@@ -71,8 +70,6 @@ public void add(Context context, JSONObject jsonObj) {
             }
         }
 
-=======
->>>>>>> fix(apps): add thread manager
         item.add(jsonObj);
         process(context);
     }
@@ -101,7 +98,6 @@ public void process(Context context) {
                 String versionCode = jsonObj.getString("versionCode");
                 String taskId = jsonObj.getString("taskId");
 
-<<<<<<< HEAD
                 ApplicationData apps = new ApplicationData(context);
                 Application[] appsArray = apps.getApplicationsById(id);
 
@@ -120,13 +116,6 @@ public void process(Context context) {
                 }
             } catch (Exception ex) {
                 FlyveLog.e(ex.getMessage());
-=======
-                // execute the policy
-                PoliciesController policiesController = new PoliciesController(context, this.client);
-                policiesController.installPackage(deployApp, id, versionCode, taskId);
-            } catch (Exception ex) {
-                FlyveLog.e("");
->>>>>>> fix(apps): add thread manager
             }
         }
     }