fixes merge conflicts on LabTemplate
fixes merge conflict