set merge strategy on .travis.yml to 'ours'