Fix conflict after merged