After-merge restore of filereader stuff