DDBNEXT-979: solving conflicts