resolved merge conflicts
resolved merge conflicts by using checkout --theirs for all files except for the app/views/job_offers/show.html.erb file since a localisation specific translation path has changed
always used --theirs in merge