fixes merge conflict in six california's quiz