removed <<<<HEAD at the top of
mta_api.rb