turned off neocomplcache autocomplete
fixed merge