Simplify and deduplicate Order#merge! implementation

I think the 2nd param should be dropped altogether. And simply use `self.user ||= order.user` in the body of this method. This would clean up the interface from any optional params that are kind of a smell in itself.