Fix wrong variable reference after rebase conflict.
Merge pull request #21 from nubs/fix-rebase-conflict

Fix wrong variable reference after rebase conflict.