chore: fix merge conflicts#2634

NathanFlurry wants to merge 1 commit into

06-20-fix_get_new_actors_working_on_docker_composerivet-dev/rivet:06-20-fix_get_new_actors_working_on_docker_composefrom

06-20-chore_fix_merge_conflictsrivet-dev/rivet:06-20-chore_fix_merge_conflictsCopy head branch name to clipboard