Player fix
MORE CONFLICTS