# Now you have two remotes: 'orign' (your fork) and 'upstream' (main repo).
# Now you have two remotes: 'origin' (your fork) and 'upstream' (main repo).
```
---
...
...
@@ -60,7 +60,7 @@ git commit -a -m "fix: my fix message"
git pull --rebase upstream master
```
**This can result in conflicts** and this is normal. Fixing them is part of the process. To avoid conflicts, **warn your collegues so you don't work on the same files**.
**This can result in conflicts** and this is normal. Fixing them is part of the process. To avoid conflicts, **warn your co-workers so you don't work on the same files**.