Our previous merge and pull commands have gone smoothly because we pushed from local and merged to live. It was a one-way transaction. Things don't always go so smoothly when you work on a team, or for some other reason make changes to the same file in two different locations, then try to merge them. Let's take a look at a simple example of when this might cause an issue and how to fix it.