remove variable conflict
fix failing test
Bump version