Align conflicts handling with manual merge behaviour #104136
Description
Currently following prompt is shown when there are conflicts notification while sync is on.
Clicking on Show Conflicts action opens the diff editor directly. Instead align this with manual merge behaviour by opening the conflicts view and allowing the user to merge manually.