From d5c5748a5252b69ab2c005e4ba4c952e0ebac60e Mon Sep 17 00:00:00 2001
From: Bernd Gassmann <bernd.gassmann@intel.com>
Date: Mon, 27 May 2019 09:44:01 +0200
Subject: [PATCH] Create 1.4 release

---
 CHANGELOG.md                                 | 2 ++
 include/ad_rss/core/RssResponseResolving.hpp | 5 +----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f274aa80a3..15371b746d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 ## Latest changes
+
+## Release 1.4.0
 * Introduced more straight forward interface on intermediate functions to support better integration of the single calls into an external
   framework: SituationSnapshot, RssStateSnapshot, ProperResponse. Moved the timeIndex from the individual elements into these high level
   types to support the propagation of the timeIndex even if there are no other vehicles in the surrounding.
diff --git a/include/ad_rss/core/RssResponseResolving.hpp b/include/ad_rss/core/RssResponseResolving.hpp
index 9d9c79bd79..3155998b0b 100644
--- a/include/ad_rss/core/RssResponseResolving.hpp
+++ b/include/ad_rss/core/RssResponseResolving.hpp
@@ -96,10 +96,7 @@ class RssResponseResolving
     {
       return previousResponse;
     }
-    else
-    {
-      return newResponse;
-    }
+    return newResponse;
   }
 
   struct RssSafeState