made current_branch properly return the current branch