Bump version
Fixed conflicts