update version branch aliases.
remove stray class from merge.