conversation conflict solved