labtemp octocat
fixes merge conflicts on LabTemplate