Fixed a git merge messup in stack.xml.