With JOSM you can easy merge the 2 buildings into one preserving the history of every node and 1 of the buildings. Not sure if you can do the same with iD.