Z-index for navbar (above the commit graph)
Don't crash on checkout with conflict
Discard changes even when staged