fixed auto complete
fixed auto complete merge