More work on merging logic for particles