quiz and map
merged conflicts