Fixed User.lua by removing conflicts.

Xyxes and Grim Reaper's commits somehow conflicted and the file wasn't committed properly. This has been fixed.