adding variant_counter
merge conflict resolution