# Conflicts:
#	src/aevol_modify.cpp
#	src/libaevol/7/DnaFactory.cpp
#	src/libaevol/7/ExpManager_7.cpp
#	src/libaevol/7/Individual_7.cpp
#	src/post_treatments/aevol_post_ancestor_network_knockout_7.cpp
#	src/post_treatments/aevol_post_ancestor_stats_7.cpp
#	src/post_treatments/aevol_post_create_csv_7.cpp
#	src/post_treatments/aevol_post_create_eps_7.cpp

# Conflicts:
#	src/libaevol/7/AnnotatedChromosome.h

(legacy Individual version)

The name SIMD was meant to specify the Single Instruction Multiple Data implementation i.e. vectorization but it is now the aevol_7 (previously known as parallel_6) version.

For the moment, it is only the filenames that have been changed (not the classname).

The directory 7 contains the aevol_7 implementation of the aevol model (currently named SIMD)

Tree/lineage/ancestor stats are working for both vanilla and SIMD (but reproduceability issues between both)