string type and float type done
string type and float type done
conflict fixed