Merge conditions with $and

So that prior conditions are not ignored, merge any conditions for the
same property with $and.