Fixing merge error in setup.sh