Update integration specs for complex conflict