completed add res automatically
conflict
fix conflict
delete index
recreate index
Merge remote-tracking branch 'origin/master' into Xingze