variable name conflict fixed