modify plugin
modify template
new files
resolve conflict