Add support to 'theirs' merging strategy

This PR adds support to the `theirs` merging strategy.