changes var name
corrects mistake in merging