fix conlicts
impl local variable renaming on leafjs