fixing bugs, updated course list
added conflict alert