Finish fixing Fraction(String) and Fraction(double)
Hopefully fixed conflict with merge