Fixed merge issue as well as player declaration.
Fixed merge conflict.