* Changed "Duplicate Identifier" to "enum can only be merged..."
when either declaration of the identifier is an enum.
Partial (?) fix for #529
Not sure if the new test is necessary, all the cases seem to have been covered by others tests.
* picked a nit
