Changed the name of conflict_resolver to population_model to better reflect its function.
Completed the module rename from conflict_resolver to population_model. Been meaning to do this for some time to better reflect the module's function.