merge conflicts, new fitness func, asexual reproduction