mcq-ipv6: fixed errors during merge

Some lines were not removed due to conflicts.