Added tokens: float, int, string and bool
stylized merge