I've resolved some conflicts as I pushed further updates after your tweaks - (on waie inn building multi polygon - clearly we both had the same idea in improving this building!)

OK - (just shifted the location a fraction) prompted me to update the surrounding shops aswell.