Fixed a conflict from the previous merge.