zmbv: resolve conflicts