fix: fix last errors because of merge