fixed merge conflict due to e2e
bumped version to correct npm published version