removed unnecessary variables
merge