Resolve minor conflict in merge.