As an amateur developer every time you try to merge or update a branch with the remote branch you come across a merge conflict. So, you basically want to update your local branch with what’s in the remote master. You go into the file which have conflicts and there are 2 blocks of code.

One is between HEAD and ======= Another between ======== and adf32834h43932h3nf (commit)

So, the thing to remember is: HEAD is you. It is the latest commit in your local branch.

And the other within the other commit is the changes other have made and is merged into the master you are pulling from.