Update on quiz.php model and Merge