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 5db61be44..fc5415148 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,10 +18,25 @@ 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 fa9882785..1a39cf1e5 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
@@ -17,11 +17,25 @@ import com.vaadin.ui.renderers.ButtonRenderer;
  */
 public class LinkRenderer extends ButtonRenderer {
     private static final long serialVersionUID = -1242995370043404892L;
+
+    /**
+     * Intialise link renderer.
+     */
     public LinkRenderer() {
         super();
     }
+
+    /**
+     * Intialise link renderer with {@link RendererClickListener}
+     * 
+     * @param listener
+     *            RendererClickListener
+     */
     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 a76654eb6..9ff227223 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,13 +1361,25 @@ 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
     }
 
     /**