proper merge strategy