fixed merge errors in Analysis and Statistics