Added person_id to quizzes
Resolving conflicts