We should prevent the conflict management popup from disappearing unless user selected a conflict resolution option

When user has a conflict, if he clicks outside the conflict management popup, the popup disappears. But since he hasn't chosen any resolution option, the project is broken and shows the follwing message:

Uncaught Exception: Failed to update the working directory of project XXX