Python file error created during merge - fixed.

Sometimes this happens when two different sources are merged at the same time.