The source file in question exists in both branches but is modified between them