fix previous merge conflicts