fix merge problems

backend/src/main/java/com/bakdata/conquery/models/forms/managed/RelativeFormQueryPlan.java

@@ -217,18 +217,14 @@ private boolean hasCompleteDateContexts(List<DateContext> contexts) {
 		if (featurePlan.getAggregatorSize() <= 0 || outcomePlan.getAggregatorSize() <= 0) {
 			// Otherwise, if only features or outcomes are given check the first date context. The empty feature/outcome query
 			// will still return an empty result which will be merged with to a complete result.
-			return DateContext.Resolution.COMPLETE.equals(contexts.get(0).getSubdivisionMode());
+			return Resolution.COMPLETE.equals(contexts.get(0).getSubdivisionMode());
 		}
 
 		// We have features and outcomes check if both have complete date ranges (they should be at the beginning of the list)
 		return contexts.size() >= 2
-				&& contexts.get(0).getSubdivisionMode().equals(Resolution.COMPLETE)
-				&& contexts.get(1).getSubdivisionMode().equals(Resolution.COMPLETE)
+			   && Resolution.COMPLETE.equals(contexts.get(0).getSubdivisionMode())
+			   && Resolution.COMPLETE.equals(contexts.get(1).getSubdivisionMode())
 			   && !contexts.get(0).getFeatureGroup().equals(contexts.get(1).getFeatureGroup());
-		}
-		// Otherwise, if only features or outcomes are given check the first date context. The empty feature/outcome query
-		// will still return an empty result which will be merged with to a complete result.
-		return contexts.get(0).getSubdivisionMode().equals(Resolution.COMPLETE);
 	}
 
 	private static FormQueryPlan createSubQuery(ArrayConceptQueryPlan subPlan, List<DateContext> contexts, FeatureGroup featureGroup) {