.travis.yml: Remove temporary hack now that package has been fixed
solve conflict