fixed typo and fixed logic for retrieving template path
removed conflict markers checked in