Fixed conflict in merge.