This is a repo for demoing how to solve a merge conflict when it occurs with your partner or teammates... Merge conflicts are common and part of working with GitHub. Do not fear the conflicts.