Adding files unexpectedly lost in merge