Missed a mq -> q from earlier conflict resolution
Making comments consistent