Fix Merge Error

Fixed unresolved merge error from previous merge.