I see that i do not understand git at all
i meged conflicts and create another pull - and see that commited merged file looks different that my
i have in init

def init(self, onewire, useFloat=True):
self.ow = onewire
self.roms = [rom for rom in self.ow.scan() if rom[0] == 0x10 or rom[0] == 0x28]
self.fp = useFloat
try:
if useFloat:
1/1
except TypeError:
self.fp = False # floatingpoint not supported

but commited looks different
I must learn git more...

this one also can be closed as replaced by #9