Fix conflict after merge