player conflict fixed