Add team aliases, separates
Comment build.merge, build.generate; sort team1, team2 by names in build.normalize