[Version Control] Resolve Conflicts command for broken projects/solutions.

In case we have a conflicted project/solution file, we now offer a right click menu option to fix this.