octocat commit
fixes merge conflicts on LabTemplate