Fix pe_staging conflict