tweak code conflict tip