merging strategy theirs instead of ours.