In the table below the model, select for each conflict whether you want to accept the solution suggested or not. For complex conflicts, you can accept or reject all suggested conflict resolutions in the top row in a single step.
Once you have decided for all changes, click Apply decisions.
The BPMN diagram is adapted according to your decisions.