scientific notation working
fix merge conflict