@Override
    }

<<<<<<< HEAD:src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringFloatObjectInspector.java
    public Object getPrimitiveJavaObject(Object o) {
        return o == null ? null : get(o);
    }

    @Override
    public float get(Object o) {
        
=======
    public float get(Object o) {  
>>>>>>> c818c304aa694184a6cf87ce402ee590f5370611:json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringFloatObjectInspector.java
        if(o instanceof String) {
          return Float.parseFloat((String)o); 
        } else {

    }

    @Override
    public float get(Object o) {  
        if(o instanceof String) {
          return Float.parseFloat((String)o); 
        } else {