removed travis yml
i see no conflicts