I used to be scared of conflicts when I was a little boy; LOL, by that I mean when I started my career, but then you just get used to it.
You just simply pull the code from the main branch/fork, and resolve it step by step by reading the code. You know what changes you made and you know what changes the other guy made. If you have any doubts, just pull the other guy in and talk to him and have it resolved, like @sandeep said. :)