Found a nice way to edit the genres
in the web frontend select "Files & media/Media browser" and set checkbox at Genre, the press "Go". Now press Properties next to the wrong genres.
Change the name at the top and press "Update". If the genre is already there it will ask you if you wish to Merge - say YES here. Keep doing that for all geres that are wrong.
Now the genres are "merged".