Updating templates
Fix user path link
Fix conflict