Fixing XML error from previous merge