fixed URL
fixed merge conflicts on LabTemplate