solving conflicts
adding the gens versions
resolving conflict