Update quests_rachel.txt

resolved merge conflict in quests_rachel.txt