Fix file tree not building with non initialized files - Really do it Edition
Fix conflicts