Make selecting the correct data in conflictsSolve clearer #92
Description
When fixing a conflict by merging it with another conflict, you can select the correct data.
Make it clear that only the base-data(Name, Birthday) will be selected with this.
The "new" data (extra-columns from the excelfile, like newUsername or special_course) will still overwrite the columns of the user-entry in SystemUsers..