Use 3 way diff:

http://blog.wuwon.id.au/2010/09/painless-merge-conflict-resolution-in.html