fixed merge conflicts
trying to figure out templating