So far there has not been a fix for this problem. Best thing to do is replace the combined buildings with two single buildings using Edit Town. You will have to use separate lots for each building, so if you have a lot that is way to big for a single building, you can remove that lot and replace it with smaller ones, so that you can place the two buildings near each other.