rebase and resolve conflicts, revert macros changes

Taras Tyshko · Taras Tyshko · commit e8e82af704ee · 2025-09-12T11:06:07.000+03:00
diff --git a/lib/nerves_hub_web/api_spec.ex b/lib/nerves_hub_web/api_spec.ex
@@ -12,8 +12,8 @@ defmodule NervesHubWeb.ApiSpec do
 
   alias NervesHubWeb.API.OpenAPI.DeviceControllerSpecs
   alias NervesHubWeb.Endpoint
-  alias NervesHubWeb.Router
   alias NervesHubWeb.Plugs.ImAlive
+  alias NervesHubWeb.Router
 
   @behaviour OpenApi
 
