mesa: fix merge conflict (in comment)