updates with merge