wrote Math file
fixed merge