Update setup.sh

Remove merge conflict in setup script
Merge pull request #2 from nixterrimus/patch-1

Remove Merge Conflict