add course location table
resolve conflict