Simplify and deduplicate Order#merge! implementation

Should this first line become (eventually, not now):  `def merge!(order, user = order.user)` ?