Fixed remaining conflict (again)