updated with merge