root: Refactor
root: reconcile the heads