Resolve ambiguities based on closer common ancestor (#498)

Resolve ambiguities based on closer common ancestor (#498) #978