* increase readability by using f-strings * readd merge conflict stuff --------- Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>
* increase readability by using f-strings * readd merge conflict stuff --------- Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>