merge to update