conflict hosting fix