clean template files
resolve conflicts