Fixed removal of conflicts, adjusted some things to get conflict resolution working through the web-api.
Merge branch 'RemoteWebApi' into SprintInProgress
Merge commit 'be0c3fe8a9d223ff5ccddef12e816997a1ab2d9f' into SprintInProgress