Fixes a merge conflict from previous merge.