The --delete-excluded code now also drops any merge file that was