rettet part 1
merged, and included whole report