chore: merge and fix conflicts

src/views/components/common/CalendarGridCell/CalendarGridCell.tsx

@@ -0,0 +1,15 @@
+import React from 'react';
+
+import styles from './CalendarGridCell.module.scss';
+
+/**
+ * Component representing each 1 hour time block of a calendar
+ * @param props
+ */
+const CalendarCell: React.FC = props => (
+    <div className={styles.calendarCell}>
+        <div className={styles.hourLine} />
+    </div>
+);
+
+export default CalendarCell;