Conflict solution

diff --cc osmxml.py
index d4385a4b0c63c46b5d021b301adf5260d5d6ef9c,c90879cad3a15a41d7d35f6a19ad4c2925a4e211..29ad3d105446f1b9ad6373fbbfc3bf83ba48bff2
--- 1/osmxml.py
--- 2/osmxml.py
+++ b/osmxml.py
@@@ -207,7 -207,7 +207,8 @@@ class mstr_osmxml
  \r
      # Again, a crash on number checking of levels.\r
      # Short call for sanity check\r
-     def is_float(self, element: any) -> bool:\r
++\r
+     def is_float(element: any) -> bool:\r
          #If you expect None to be passed:\r
          if element is None: \r
              return False\r