code conflict alert