add ignore list
resolve conflict
new template