Add test for conflicts where both deleted