variable conflict fixes