Fixed inconsistency caused by correcting merge-error

Yeah, it happens.