budget plan non plan merged