conflict no travis