Add Auto-Completion
Finish Auto-Completion
Merged autocompletion fixed conflict