help
fixes merge conflicts on LabTemplate