resolve conflict in survey_participations.rb