Fixed merge
Added PrefixUnit equality, fixes #1