fixed merge conflict in spec helper