Failed to setup company after merging code

So I merged erpnext master code into mine (v8.11.4) and tried to setup but I always get this error. Took hints from other posts with similar errors and tried bench reinstall but situation is still the same.

I tried searching for errors in bench start trace and Chrome but none were found.

One hack I tried was to delete all in tabDomain the Duplicate name error would go but the Address error would still be there.

image

image