Fix.travis conflict with upstream