finished diagnostic map
merged