Fixed removal of conflicts, adjusted some things to get conflict resolution working through the web-api.