add a little Python to taste
conflict fix