Update integration specs to add a case with a conflict on a child spec