Changed merge strategy