courses.json file
merge conflicts