fix travy
merge