SMC: fix mismerge