add vectors, resolve conflicts