Clean up files after merge