Forgot a few merge conflicts. Fixed them in set_up_virtual_machine.md