Keep both sides
Your task Merge salad and look inside menu.html. Write the menu again with three lines: <h1>Menu</h1>, then <p>Soup</p>, then <p>Salad</p>. Add it, commit with the note Merge salad, then run cat menu.html and git status.
Getting the editor ready