conflict made