It will combine and you'll be over your amount until you buy more slots or remove items; at least that's how it always worked before and what I've personally experienced. Same with character slots, except if you go over the amount of slots you own the characters will be inaccessible with a warning/notice/whatever you want to call it that you can't play them.