Update setup.sh

Remove merge conflict in setup script