Scottzonn

Type: Bug Create a merge conflict in git. Like this: `git checkout -b test-branch3 && echo "test branch" >> file.txt && git add . && git commit -m "test branch...