updating merge strategy - not done yet