mama
fixes merge conflicts on LabTemplate