edit model.rb

app/models/city.rb

@@ -14,10 +14,7 @@
 #
 
 class City < ApplicationRecord
-<<<<<<< HEAD
   scope :vn_cities, -> {where region: "Việt Nam"}
   scope :inter_cities, -> {where region: "#"}
-=======
   has_many :city_jobs
->>>>>>> first edit this branch
 end

app/models/job.rb

@@ -31,5 +31,4 @@
 class Job < ApplicationRecord
   belongs_to :company
 
-  has_many :city_jobs
-end
+  has_many :cities, through: :city_jobs