Revert "[fix,#58] rebase and resolved conflicts"

This reverts commit 07536c13
2 jobs for revert-07536c13 in 3 minutes and 15 seconds (queued for 4 seconds)
latest
Status Job ID Name Coverage
  Kotlin
passed #270447
test

00:02:31

 
  Python
passed #270448
linting

00:00:44