finished gen_starts
fixed merge conflicts