Fixed merge issues

2 jobs for 18-quiz-list-add-average-number-of-attempts-frontend in 2 minutes and 55 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Test
passed unit-test #5461

00:01:07

 
  Build
passed build-all #5462

00:01:47