openolat#137: fixed merge variable rename conflict

src/main/java/org/olat/core/dispatcher/ErrorFeedbackMailer.java

@@ -95,7 +95,7 @@ public class ErrorFeedbackMailer implements Dispatcher {
 				Collection<String> logFileEntries = LogFileParser.getErrorToday(errorNr, false);
 				StringBuilder out = new StringBuilder(2048);
 				out.append(feedback)
-				   .append("\n------------------------------------------\n\n --- from user: ").append(identityKey).append(" ---");
+				   .append("\n------------------------------------------\n\n --- from user: ").append(username).append(" ---");
 				if (logFileEntries != null) {
 					for (Iterator<String> iter = logFileEntries.iterator(); iter.hasNext();) {
 						out.append(iter.next());