removed def emission from receipt model
resolved conflicts in receipts.rb