fix a serialization error
bump version
fix conflicts