GroupedAndMergedLines module

Conflicts:
	app/models/order.rb