Removing player function
Merge conflicts