Add complex conflict case