Fix bad merge
Fix references
Add missing project reference: Voron