You did pull if there are merge conflicts.  You just need to resolve them.  http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging#Basic-Merge-Conflicts