I deleted a few buildings that were just added in changeset/188226575 to resolve the conflicts

ref:

https://ja.wikipedia.org/wiki/%E5%AE%87%E5%9F%8E%E5%BA%83%E5%9F%9F%E9%80%A3%E5%90%88#%E6%B6%88%E9%98%B2%E7%BD%B2

https://www.ukisyobo.or.jp/q/list/34.html

I decided to remove all the relations and "outline" members, only keep the building parts, and manually change them to building=*. Seems like this is the easiest way...

should be all good now with changeset #186767285

There are still issues left. I will try to fix them later.