Things went better than I expected. If the conflict had to do with armatures, I went with the bf version, If the conflict had to do with displists, I went with bf (the DAG stuff). Test, test, test! Thanks to Martin for helping with post-merge. Chris