teiiddes-1882

Fixes  merge issues