I made some changes
Fixed merge conflicts on LabTemplate