changed
fixes merge conflicts on LabTemplate