add local variable counter
fix conflict
rename visitor method as well as new node name.