Clean up merge issues

[jinjorge]

• a couple of merge issues made it in to release v2.6. Cleaned them up here

@noahbaron Please take a look and let me know if there are any changes to make.

Thanks 👍

[noahbaron]

Thanks, looks good.