Resolve conflicts?

Update changelog.json

Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>

Update changelog.json

Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>

Bump version and changelog to 2.9.6-beta1

Release 2.9.5

Release 2.9.5-beta4

Update changelog.json

Co-authored-by: Sergio Padrino <sergio.padrino@gmail.com>

Release 2.9.5-beta2

Update changelog.json

Co-authored-by: Billy Griffin <5091167+billygriffin@users.noreply.github.com>

Update changelog.json