More files that got overwritten when Tortoise merged the wrong direction.