Of course the changes produced in C and D however can conflict with what was accomplished by any of your x, but that may be just a normal merge conflict.For anyone who is on Python 2, you can backport the pathlib module from pypi, pathlib2, or or else Verify isfile from your os.path module: