MSC: fix merge conflict