they're two different spellings of the same thing i support the merge