Update package
Resolve conflicts
Bump versions