Solving problems from a previous merge