[#81842518] add some style to autocomplete
fix conflicts