Fix merge conflicts

Author: wang3101

app/App.tsx

@@ -3,7 +3,7 @@ import Splash from './components/Splash';
 import DashboardContainer from './containers/DashboardContainer';
 
 const App: React.FC = () => {
-  // HARD CODED for development
+  // Disable splash for development
   // const [firstVisit, setFirstVisit] = useState(false);
 
   // UNCOMMENT this for splash demo

app/assets/icons/icon.png renamed to app/assets/icon.png

@@ -2,12 +2,6 @@ import React, { useContext } from 'react';
 import Plot from 'react-plotly.js';
 import { HealthContext } from '../context/HealthContext';
 
-/**
- * @desc Latency Chart
- * @param object props- passed from GraphsContainer
- * @return component - component for latency graph
- */
-
 const LatencyChart = () => {
   const { healthData } = useContext(HealthContext);
 

app/charts/LatencyChart.tsx

@@ -16,6 +16,7 @@ const RequestTypesChart: React.FC = () => {
     time: string;
   }
   const createRequestChart = () => {
+    // Counter for request types
     const requestTypes: { [key: string]: number } = {
       DELETE: 0,
       GET: 0,
@@ -25,7 +26,7 @@ const RequestTypesChart: React.FC = () => {
       PUT: 0,
     };
 
-    // Record each request type in the requestTypes object
+    // Record each request type frequencies
     let type;
     commsData.forEach((obj: IObject) => {
       type = obj.request;

app/charts/RequestTypesChart.tsx

@@ -17,6 +17,7 @@ const ResponseCodesChart: React.FC = () => {
   const { commsData } = useContext(CommsContext);
 
   const createChart = () => {
+    // Counter for request types
     const responseCodes = {
       '100-199': 0,
       '200-299': 0,
@@ -26,7 +27,7 @@ const ResponseCodesChart: React.FC = () => {
       NULL: 0,
     };
 
-    // Record each status code in the responseCodes object
+    // Record each status code frequencies
     commsData.forEach((obj: IObj) => {
       const status = obj.responsestatus;
       if (status >= 500) {