fixed conflict
changed license from ASF to CDDL