Use 'theirs' merge strategy