unless you have specific local knowledge or survey I think best to leave them apart as different structures, but eitherway the original way should have been retained https://wiki.openstreetmap.org/wiki/Good_practice#Keep_the_history