Fix weird inconsistency/merge conflict.