Not surprisingly the improvements manufactured in C and D even now can conflict with what was done by any of your x, but which is just a standard merge conflict. If you're on Python two, you can backport the pathlib module from pypi, pathlib2, or in any other case check isfile from the os.pat