resolve lurking conflict