2321: Fixed merge

Author: tuj

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 
 - [#264](https://github.com/os2display/display-admin-client/pull/264)
   - Added checkbox options component for use in calendar modifiers.
+  - Fixed multiselect when more than one feed source of the given type is installed.
 - [#268](https://github.com/os2display/display-admin-client/pull/268)
   - Added feed source UI.
 

src/components/feed-sources/templates/calendar-api-feed-type.jsx

@@ -1,8 +1,8 @@
 import { React, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { useTranslation } from "react-i18next";
-import { Alert } from "react-bootstrap";
 import MultiselectFromEndpoint from "../../slide/content/multiselect-from-endpoint";
+import { Alert } from "react-bootstrap";
 import ConfigLoader from "../../../config-loader";
 
 const CalendarApiFeedType = ({