Revert to deriving node color from the same attribute as before
Fix bug resulting in black nodes when hovering over rebase
Support resolving conflicts on deleted files. Fixes #233