Can't add script component after mergeconflict

Hi guys,
so after merging the lastest version from git into my branch I had some mergeconflicts in a class and now I cannot add it to game objects anymore. For every other script it works fine, but not for this one.

When I google this error all I find is that I should rename the class, but the name is correct already. Also I fixed all compile errors, but I still get the same error message.

Does anyone have an idea where this error might come from?

So I was looking at the affected file again and apart from my own changes there was only one small adjustment which was that we added a namespace to the class.
Since the change was so small I fixed the problem by resetting to the old branch and adding the change manually.

None the less this might be an issue worth looking into if it is reproducable.

Cheers,
Kobold833