I just spotted another error: the Kum & Go at https://www.openstreetmap.org/way/688751094 - This is a "roof" building at layer 1, and if you merge the gas station to the roof, the gas station is at layer 1...which is nonsensical as it's at layer 0(or no layer tag).  So this is another example not to merge the two.  I changed it back while changing it to a Maverik as the station has rebranded -- as witnessed in a drive by.  Actually it's been a Maverik for a few months, I don't know why I haven't noted and changed it...