fixes merge conflicts on LabTemplate