This repo is to practice fixing merge conflicts.
Hello this is Jus! trying to create a merge conflict.
This is Amy, we are trying to do a merge conflict. I'm in a group with Jo and Justine doing this.
This is Jo, we are trying to create a merge conflict