Fix merging conflict, use current User for diary Entry!