solved autocomplete
resolved merge conflict autocomplete