[Vinnl]

AFAIK they added conflict resolution just recently, so it's not like non-AI features such as Git get no attention at all. And of course the debugger now.