Commit 9627c110bee81b5d7368441eaf4e661010ba9cd5

Stefan Sperling 2020-04-18T18:40:01

show a summary of conflicts and related problems after updating/merging files ok millert@