Resolve conflit with language