fixing conflict[

README.txt

@@ -192,7 +192,8 @@ continuous electric sheep genetic crossfades are created like this:
     env inter=test.flam3 frame=10 nframes=20 flam3-genome > inter10.flam3
     env frame=10 flam3-animate < inter10.flam3
 
-see https://flam3.com/flame_draves.pdf for descriptions & formulas, and
+see http://flam3.com/flame.pdf for descriptions & formulas, and
+see http://electricsheep.wikispaces.com/Variations for updates.
 
 The complete list of variations:
 
@@ -295,7 +296,7 @@ The complete list of variations:
   96. auger
   97. flux
   
-see https://flam3.com/flame_draves.pdf for descriptions & formulas for each of
+see http://flam3.com/flame.pdf for descriptions & formulas for each of
 these.  note that, by default, if a random flame is requested and neither
 'use_vars' or 'dont_use_vars' are specified, the following variations are
 not used: noise, blur, gaussian_blur, radial_blur, ngon, square, rays, 

flam3-genome.c

@@ -1131,7 +1131,7 @@ main(argc, argv)
          if (maxforms && atoi(maxforms)) {
             cp_save.symmetry = 0;
             while (cp_save.num_xforms > atoi(maxforms))
-		flam3_delete_xform(&cp_save, 0);
+               flam3_delete_xform(&cp_save, cp_save.num_xforms - 1);
          }
       }