build.sh: Resolving conflict