Complete exams crud
Resolve conflicts