Removes old files from merge conflicts.