Merging in old conflicted files