bump version
fix conflict