merge hannes' private tree