fixing temp variablenaming conflict
merge