resolved merge issues with the octAnalysisPanel