Update the call to merge.parse_scaling

The internal structure changed, to verify this doesn't happen again we
now use parse_scaling to generate the structure for us.

Change-Id: I8c737a968d5ae8794a578b375241de429b2ef89e