I've used government basemap for the buildings and as they came as a AutoCAD format I've added georeference and imported it to JOSM. I tried to fix intersecting lines but I gave up after a point since it wasn't crating any visual problems. I will try to fix them gradually. Thanks for your concern.