You edited the .gitignore in both branches. Now, git is unsure of which lines in each copy are the correct ones so it is asking you to resolve them.
The lines:
<<<<<<< HEAD
public/img/ignore
=======
Are what appears in the copy of the file in master.
And
=======
public/img/profiles
public/blog
public/recommendation
>>>>>>> newfeature
in the branch newfeature
You should just have to edit the file as you would like it to appear finally. Then…
git add .gitignore
git commit