Adds toaster for conflicting files. OnAllCommitsReceived now reurns a Map instead of a list