fixed merge conflict that I forgot to fix