fix conflix