Update setup.txt

added merge option