Travis Coverall
fix merge issues