[kaetemi]

Actually, an AI assisted magic merge conflict fixer would be neat. (Compared to coworker just overwrote all conflicts with their own changes.)