No, mate. There were going to be six novels. AFfC ended up too long, so he split it in two halves, one set mostly in the South, and the next mostly in the North, thereby taking the total out to seven novels. ADwD won't be merged with anything. It's the second half by itself, and then the intended fifth novel becomes the sixth, and the sixth the seventh.
Check out
this thread for more. Am trying to find the titles list, but haven't managed so far...