trying to commit again
fixes merge conflicts on LabTemplate