Fixed conflict from the previous merge