adding conflict view