edited setup_fedora.sh
fixed conflicts