Fix conflict (2)