Resolve conflicts

Author: ThomasKranitsas

.circleci/config.yml

@@ -192,7 +192,6 @@ workflows:
                 - hot-fixes
                 - develop
                 - general-features
-                - server_side_filtering
       # Production builds are exectuted only on tagged commits to the
       # master branch.
       - "build-prod":
@@ -207,4 +206,4 @@ workflows:
           filters:
             branches:
               ignore:
-                - develop
+                - develop