Remove unneeded files after merge