Resolve variable conflict