LGTM

I updated it, but created another fork, is that ok?

thanks, I updated the tests, but I couldn't find the conflict, where shoule I check for it?

thanks for the feedback, just added a couple of random tests

I forked it and solved the conflict, is that right?

done