Adding my own player that's about to be overwritten
Fixed merge conflict