Resolving error from previous merge