Fixed merge conflict in web-build.yml