Merge conflicting pull request

Tag(s):

  1. Right-click on you project, Team->Pull...
  2. Add New Remote... Reference=master, When pulling=Merge.
  3. Click on Finish.