Add support to 'theirs' merging strategy

This PR adds support to the `theirs` merging strategy.
Merge pull request #255 from marcospassos/patch-1

Add support to theirs merging strategy