Araxis merge. Four views. Theirs, ours, base and “what you did so far in this damned merge hell”.