I fucked up PlayerFacade's merge somehow