diff --git a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
index 76578274d..723d5202d 100644
--- a/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
+++ b/hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/filtermanagement/CreateOrUpdateFilterHeader.java
@@ -26,9 +26,9 @@ import org.eclipse.hawkbit.ui.utils.I18N;
 import org.eclipse.hawkbit.ui.utils.SPUIComponetIdProvider;
 import org.eclipse.hawkbit.ui.utils.SPUILabelDefinitions;
 import org.eclipse.hawkbit.ui.utils.SPUIStyleDefinitions;
-import org.eclipse.hawkbit.ui.utils.SpringContextHelper;
 import org.eclipse.hawkbit.ui.utils.UINotification;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.vaadin.spring.events.EventBus;
 import org.vaadin.spring.events.EventScope;
 import org.vaadin.spring.events.annotation.EventBusListenerMethod;
@@ -85,6 +85,8 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
     @Autowired
     private UINotification notification;
 
+    @Autowired
+    @Qualifier("uiExecutor")
     private transient Executor executor;
 
     private Label headerCaption;
@@ -130,7 +132,6 @@ public class CreateOrUpdateFilterHeader extends VerticalLayout implements Button
         restoreOnLoad();
         setUpCaptionLayout(filterManagementUIState.isCreateFilterViewDisplayed());
         eventBus.subscribe(this);
-        executor = (Executor) SpringContextHelper.getBean("uiExecutor");
     }
 
     private void restoreOnLoad() {
diff --git a/hawkbit-ui/src/main/resources/messages.properties b/hawkbit-ui/src/main/resources/messages.properties
index c39b52d2c..08617bd58 100644
--- a/hawkbit-ui/src/main/resources/messages.properties
+++ b/hawkbit-ui/src/main/resources/messages.properties
@@ -123,18 +123,15 @@ label.combobox.type  = Select Type
 label.combobox.tag = Select Tag
 label.choose.tag = Choose Tag to update
 label.choose.tag.color = Choose Tag Color
-<<<<<<< HEAD
 label.filter = Filter:
 label.target.filter.count = Total Targets:
 label.target.filtered.total = Total filtered targets :
 label.filter.selected = Selected:
 label.filter.shown = Shown:
-=======
 label.filter = Filter : 
 label.target.filter.count = Total Targets : 
 label.filter.selected = Selected : 
 label.filter.shown = Shown : 
->>>>>>> refs/heads/master
 label.filter.targets = Filtered targets :
 label.filter.status = Status,
 label.filter.tags = Tags,
diff --git a/hawkbit-ui/src/main/resources/messages_de.properties b/hawkbit-ui/src/main/resources/messages_de.properties
index b34718f53..c1d9a850f 100644
--- a/hawkbit-ui/src/main/resources/messages_de.properties
+++ b/hawkbit-ui/src/main/resources/messages_de.properties
@@ -122,18 +122,15 @@ label.combobox.type  = Select Type
 label.combobox.tag = Select Tag
 label.choose.tag = Choose Tag to update
 label.choose.tag.color = Choose Tag Color
-<<<<<<< HEAD
 label.filter = Filter:
 label.target.filter.count = Total Targets:
 label.target.filtered.total = Total filtered targets :
 label.filter.selected = Selected:
 label.filter.shown = Shown:
-=======
 label.filter = Filter : 
 label.target.filter.count = Total Targets : 
 label.filter.selected = Selected : 
 label.filter.shown = Shown : 
->>>>>>> refs/heads/master
 label.filter.status = Status,
 label.filter.tags = Tags,
 label.filter.text = Search Text
diff --git a/hawkbit-ui/src/main/resources/messages_en.properties b/hawkbit-ui/src/main/resources/messages_en.properties
index 59f026526..b1f95cb45 100644
--- a/hawkbit-ui/src/main/resources/messages_en.properties
+++ b/hawkbit-ui/src/main/resources/messages_en.properties
@@ -122,19 +122,16 @@ label.combobox.type  = Select Type
 label.combobox.tag = Select Tag
 label.choose.tag = Choose Tag to update
 label.choose.tag.color = Choose Tag Color
-<<<<<<< HEAD
 label.filter = Filter:
 label.target.filter.count = Total Targets:
 label.target.filtered.total = Total filtered targets :
 label.filter.selected = Selected:
 label.filter.shown = Shown:
 label.filter.targets = Filtered targets :
-=======
 label.filter = Filter : 
 label.target.filter.count = Total Targets : 
 label.filter.selected = Selected : 
 label.filter.shown = Shown : 
->>>>>>> refs/heads/master
 label.filter.status = Status,
 label.filter.tags = Tags,
 label.filter.text = Search Text