better renaming of variables when there is a conflict . closes #655