wrote a blog post called how to avoid merge conflicts

https://dev.to/github/how-to-prevent-merge-conflicts-or-at-least-have-less-of-them-109p