Toll rises to 31 as 22-hour standoff ends at Pakistan police line HQ