variable conflict resolved