Theirs merge strategy for Travis config