There is a merge conflict

[kunwar45]

cu-flow/backend/routes/courses.js

Lines 3 to 15 in 92e4528

	<<<<<<< HEAD
	const { showCourse, indexCourse,createCourse,deleteCourse,updateCourse } = require("../controllers/courseController");
	//get specified course
	router.get("/:id", showCourse);
	router.get("/", indexCourse);
	=======
	const { getCourse, getAllCourses,createCourse,deleteCourse,updateCourse } = require("../controllers/courseController");
	//get specified course
	router.get("/:id", getCourse);
	router.get("/", getAllCourses);
	>>>>>>> 7b546e4fa9a9a392bb17e31823b0d3f9348abbe8

Someone did not resolve the conflict and just pushed.