Fixed order changed by merge conflict.