Avoiding merge conflicts

• try to only branch off of main. You can branch off of another branch, but do so very sparingly

• use git rebaseto avoid re-committing code that has already been merged