BTW not sure how you feel about LLMs but merge conflicts are not really an issue with them any more.