Merge errors fixed (user --> player)