Feature/completions resolve duplicates