Hi,
you used tags like "level:1-2=residential" to mark the use of different parts of two buildings. 
Usually, this is mapped using two building:part=yes objects with their respective building:use tags. Could you have a look at this tagging scheme?