merger fixed