Whoa! What happened here?

We've created a merge conflictGit added special markings to cookie.txtWe've made changes in different branchesIt looks like we got a virus

Sweet! The special markings indicate that we've made changes in different branches and created a merge conflict.

Whoops! The special markings indicate that we've made changes in different branches and created a merge conflict.