Fix merge conflict
Fix merge conflict

lydell/prettier,prettier/prettier,prettier/prettier,existentialism/prettier,azz/prettier,Skywalker13/prettier-space-parenthesis,rattrayalex/prettier,azz/prettier,lydell/prettier,rattrayalex/prettier,arijs/prettier-with-tabs,existentialism/prettier,prettier/prettier,existentialism/prettier,azz/prettier,arijs/prettier-miscellaneous,arijs/prettier-with-tabs,rattrayalex/prettier,yamafaktory/prettier,lydell/prettier,prettier/prettier,despairblue/prettier,arijs/prettier-miscellaneous,despairblue/prettier,lydell/prettier,Skywalker13/prettier-space-parenthesis,Skywalker13/prettier-space-parenthesis,jlongster/prettier,arijs/prettier-miscellaneous,azz/prettier,existentialism/prettier,arijs/prettier-miscellaneous,yamafaktory/prettier,Skywalker13/prettier-space-parenthesis