fixed conflicts in build.sh