* refactor: resolve merge conflict * refactor: added support to value conversion * refactor: linter fixes * refactor: build fixes