new tree format
solving git conflicts