Git Conflicts when update.sh is executed

[zenware]

Branch zero set up to track remote branch zero from origin.
Switched to a new branch 'zero'
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
README.md: needs merge
error: you need to resolve your current index first

[ossanna16]

@brosner @paltman Can one of you help with this?

[zenware]

We're about to use pinax to start a project so we'll have to figure it out, and if we do then I'll come back with a fix

[ossanna16]

@zenware Also feel free to bring up any questions/bugs in the Slack channel. We're usually able to help faster in Slack.

[brosner]

@zenware what is the reason you need to execute update.sh to use Pinax? update.sh is specifically for the development of starter projects. Could you provide some more information?

I suspect the issue here is that something does need to be resolved. Could you post the resulting README.md so we can see the conflicts.

[zenware]

@brosner You are correct, and I also plan on helping to develop some of the starter projects. I have functional projects setup already, I just figured it was something that ought to be fixed.

I added slashes to the triple backtick inside the file contents to escape them in this context, as I'm not familiar with another way to do that.

# {{ project_name }}

## Getting Started

Make sure you are using a virtual environment of some sort (e.g. `virtualenv` or
`pyenv`).

<<<<<<< HEAD
\```
pip install -r requirements.txt
./manage.py migrate
./manage.py loaddata sites
./manage.py runserver
\```
=======
Pinax
--------

Pinax is a collection of Django project templates that we call starter projects
as well as apps and themes. This collection can be found at http://pinaxproject.com.

Documentation
---------------

The `pinax-starter-projects` documentation is available at http://pinaxproject.com/pinax/pinax_starter_projects/. The Pinax documentation is available at http://pinaxproject.com/pinax/.

Contribute
----------------

See [this blog post](http://blog.pinaxproject.com/2016/02/26/recap-february-pinax-hangout/) including a video, or our [How to Contribute](http://pinaxproject.com/pinax/how_to_contribute/) section for an overview on how contributing to Pinax works. For concrete contribution ideas, please see our [Ways to Contribute/What We Need Help With](http://pinaxproject.com/pinax/ways_to_contribute/) section.

In case of any questions, we recommend you [join our Pinax Slack team](http://slack.pinaxproject.com) and ping us there instead of creating an issue on GitHub. Creating issues on GitHub is of course also valid but we are usually able to help you faster if you ping us in Slack.

We also highly recommend reading our [Open Source and Self-Care blog post](http://blog.pinaxproject.com/2016/01/19/open-source-and-self-care/).  

Code of Conduct
-----------------

In order to foster a kind, inclusive, and harassment-free community, the Pinax Project has a code of conduct, which can be found here  http://pinaxproject.com/pinax/code_of_conduct/. 
We ask you to treat everyone as a smart human programmer that shares an interest in Python, Django, and Pinax with you.

Pinax Project Blog and Twitter
--------------------------------

For updates and news regarding the Pinax Project, please follow us on Twitter at [@pinaxproject](https://twitter.com/pinaxproject) and check out our blog http://blog.pinaxproject.com.
>>>>>>> master

[zenware]

Oh, it's just that it's trying to merge every branch into the previous branch. I guess there's no problem at all actually. I'm curious why it's doing that though.