added username to conflict display, minor edits