add entity disambiguation
merge local and remote stuff
Merge branch 'master' of https://github.com/antoine-tran/hedera