updated more conflicts