fixed merge conflict that made it into the repository, and prevented installation due to syntax errors