Can we consolidate the merge above, instead of here. Just looks complicated when done here - feels like default definitions and the merge should be done together.