Fix conflicts in next_steps.txt