Solve merge mistakes