Rename conflict variable with the following block

This commit removes below interpreter warning.

* warning: shadowing outer local variable
Merge pull request #24 from kachick/improve-remove_warnings

Rename conflict variable with the following block