Tweaked merging strategy in common code