Fix URL problem (with conflict xD)
fixes merge conflicts on LabTemplate