resolved issues 1...10