Fixes bad merge edit autocomplete control