Evolve with Rick

conflict resolution