Removed the variable name conflict logic