resolving merge conflict
Spawn player