xxan: resolve conflicts