Description of the illustration conflict-resolved.png A Continue button is also shown. Copyright © 2023, 2025, Oracle and/or its affiliates.