diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/HtmlButtonRenderer.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/HtmlButtonRenderer.java
index fc5415148..367c9dc8b 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/HtmlButtonRenderer.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/HtmlButtonRenderer.java
@@ -18,25 +18,19 @@ import com.vaadin.ui.renderers.ButtonRenderer;
 public class HtmlButtonRenderer extends ButtonRenderer {
     private static final long serialVersionUID = -1242995370043404892L;
 
-<<<<<<< HEAD
     /**
      * Intialize button renderer.
      */
-=======
->>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
     public HtmlButtonRenderer() {
         super();
     }
 
-<<<<<<< HEAD
     /**
      * Intialize button renderer with {@link RendererClickListener}
      * 
      * @param listener
      *            RendererClickListener
      */
-=======
->>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
     public HtmlButtonRenderer(RendererClickListener listener) {
         super(listener);
     }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/LinkRenderer.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/LinkRenderer.java
index 1a39cf1e5..d913ca380 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/LinkRenderer.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/customrenderers/renderers/LinkRenderer.java
@@ -34,8 +34,4 @@ public class LinkRenderer extends ButtonRenderer {
     public LinkRenderer(RendererClickListener listener) {
         super(listener);
     }
-<<<<<<< HEAD
-=======
-    
->>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
 }
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
index 9ff227223..e697e220e 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/utils/HawkbitCommonUtil.java
@@ -1361,25 +1361,13 @@ public final class HawkbitCommonUtil {
      */
     public static String getFormattedString(Map<Status, Long> details) {
         StringBuilder val = new StringBuilder();
-<<<<<<< HEAD
         if (details == null || details.isEmpty()) {
             return null;
-=======
-        if (null != details && !details.isEmpty()) {
-            for (Entry<Status, Long> entry : details.entrySet()) {
-                val.append(entry.getKey()).append(":").append(entry.getValue()).append(",");
-            }
-            return val.substring(0, val.length() - 1);
->>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
         }
-<<<<<<< HEAD
         for (Entry<Status, Long> entry : details.entrySet()) {
             val.append(entry.getKey()).append(":").append(entry.getValue()).append(",");
         }
         return val.substring(0, val.length() - 1);
-=======
-        return null;
->>>>>>> branch 'Rollout_migrate_table_to_grid_final' of https://github.com/bsinno/hawkbit
     }
 
     /**