Resolving variable name conflict