feat(identity): Add id field in update domain tool(#31)

- Resolve conflict

Author: S0okJu

src/openstack_mcp_server/tools/identity_tools.py

@@ -23,11 +23,8 @@ def register_tools(self, mcp: FastMCP):
         mcp.tool()(self.get_domains)
         mcp.tool()(self.get_domain)
         mcp.tool()(self.create_domain)
-<<<<<<< HEAD
         mcp.tool()(self.delete_domain)
         mcp.tool()(self.update_domain)
-=======
->>>>>>> d7d60da163653af86da9ffa64fb394cbb1ea8c40
 
     def get_regions(self) -> list[Region]:
         """