master
chore: resolve conflicts
test: update integration tests
style: address integration tests lint errors