Resolve merge conflicts automatically by using `recursive:theirs`