mdec: resolve conflicts