Fix Conflicts/Errors window behaviors

1. Only 1 conflict at a time is shown.

2. When clicking on an action to do something, the conflict/error is not removed. The conflict should be removed from the list.