Update meetups_controller.rb

removed a weird comma in the create method
fixed merge conflict