I ran `git pull origin` and now I have some issues with merge my branch with a master.

Here's what I did:

1. commit all changes on my branch
2. git checkout master
3. git pull origin master
4. git checkout **my branch**
5. git merge master
6. open 'project.pbxproj' and removed all needed markers
7. open other conflict file and removed needed markers
8. git add for both files and git commit

Is this correct?