merge fnksmplr/dist