parenface is merging with paren-face

Old pull request was here https://github.com/milkypostman/melpa/pull/2221#issuecomment-64962777