updated base template
fixed merge issues
commit base template changes
merge