Merging POIs and fixing addresses

https://www.openstreetmap.org/user/ArtyCarty479831/diary/5676