“conflict resolution view” is another name for Three-way merge.