vcr1: resolve conflicts