Fixed Spec fails (replaced merge with merge_with)