merge template from svn