Update merge-comparables for generics