Adjusting files to merge