Fixed syntax error in upstream/Makefile introduced by merge conflict