fix ere with merge