Resolved merge conflect with consumer.rb