dsicinav: resolve conflicts