chore: resolve conflict (#2453)
* test: fix e2e tests * test: update snapshots * test: fix e2e test data * test: update e2e test data Co-authored-by: rickstaa <rick.staa@outlook.com>
This commit is contained in:
* test: fix e2e tests * test: update snapshots * test: fix e2e test data * test: update e2e test data Co-authored-by: rickstaa <rick.staa@outlook.com>