fix merge issue
add travis