If you get a warning message when you ran `git pull` regarding how to reconcile divergent messages, you can run this to let git merge automatically: ```sh git config --global pull.rebase false ``` Thanks for catching this @emarpaz!