fix travis config
merge
;