code conflict fix