This page is now part of
Three-way merge
.