vmnc: resolve conflicts