Correct Foundations Merge Conflict chapter rebase (incorrect command example)