Fix merge issue in exercise.js