Fixed merge conflicts
Fixed merge conflicts

SuperDARNCanada/realtimedisplay,SuperDARNCanada/realtimedisplay,SuperDARNCanada/realtimedisplay,SuperDARNCanada/realtimedisplay,SuperDARNCanada/realtimedisplay,SuperDARNCanada/realtimedisplay,SuperDARNCanada/realtimedisplay