add autocomplete
resolve conflict