Remove "master" reference in "reducing conflicts" file

[reshamas]

1. go to this file: https://github.com/reshamas/git-intro-workshop/blob/master/extra_resources/git_reducing_conflicts.md
2. search for occurrence of master and change to main
3. submit a PR

[reshamas]

@RandalSchwartz is working on this as an example for a presentation.