Fixed player test
Fixed conflicts