Update TODO; resolve merge conflict for eshell (no actual changes)