Product conflict maintenance