add details in workshop_0
merge the conflicts