quiz updates
merge files