diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
index 1fb659535..7dec0ba22 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/layouts/AbstractCreateUpdateTagLayout.java
@@ -465,7 +465,6 @@ public abstract class AbstractCreateUpdateTagLayout<E extends NamedEntity> exten
                 .cancelButtonClickListener(event -> discard()).layout(mainLayout).i18n(i18n).buildCommonDialogWindow();
 
         window.setSaveDialogCloseListener(new SaveDialogCloseListener() {
-
             @Override
             public void saveOrUpdate() {
                 if (optiongroup.getValue().equals(createTagStr)) {
diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
index 593aa8046..8d1d6ffbb 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/management/dstable/DistributionAddUpdateWindowLayout.java
@@ -339,7 +339,6 @@ public class DistributionAddUpdateWindowLayout extends CustomComponent {
                 .content(this).layout(formLayout).i18n(i18n).buildCommonDialogWindow();
 
         window.setSaveDialogCloseListener(new SaveDialogCloseListener() {
-
             @Override
             public void saveOrUpdate() {
                 if (editDistribution) {
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 46ffd1c94..c4146cdb9 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
@@ -553,9 +553,7 @@ public final class HawkbitCommonUtil {
     }
 
     /**
-<<<<<<< HEAD
-=======
-     * Duplicate check - Unique Key.
+Duplicate check - Unique Key.
      *
      * @param name
      *            as string
@@ -573,7 +571,6 @@ public final class HawkbitCommonUtil {
     }
 
     /**
->>>>>>> refs/heads/master
      * Add new base software module.
      *
      * @param bsname