add autocomplete
merge conflig