add quiz framework
fix merge conflict