Models created.
customer.rb conflict resolved.