tho idk if best. i'm v much interest in what we can make happen with [[git-explore]] + [[(hidden) xIgGLWDKO]] integration to analyze the nature of the conflicts (e.g. code structure, what the changes mean semantically, & trying to automate resolving conflicts (or avoiding them) as much as possible)