merge strategy ours for travis