Solving errors in previous merge