travis use same merge as build and test for push

[merge]