vb: resolve conflicts