adds some template files
resolves conflicts