They should look into selling a standalone git conflict resolution app. Though for my money, nothing beats Fork if you're on a Mac: https://fork.dev (just wish it supported jujutsu)