How to Deal with Merge Conflicts in Git | CSS-Tricks