'Resolving conflicts with new PySB master.'