Resolved conflict from merge.