smc: resolve conflicts