conflict repare