title: Merge conflict Git
body: <p>I and my friend fork from the main repository (upstream). Last night, we had the same version of this repository in local machine. Then I have added a new feature and my friend also added another new feature too. My friend pulled request to the main repository and I have merge this pull request with the upstream repository with no conflict. And when I fetch from upstream and merge with my master branch, it conflicts.
  What should I do in this situation to resolve conflict? (The upstream repository should have 2 new features after resolving conflict) </p>