conflick resolved