Upload new template
resolve conflict